fix some macros