fixed some macros