Fix some macro uses