fix warnings for Macros