Fix warnings from Macros.