Change some macros