Fix to macros.