Fixes in macros