Fix some macro bits