Fix some macro issues