Fixed some macros.