Fix some macros.