Fixing some macros