Fix build for macros