Fix list of macros