Fixed some macros