modify some macros errors