macros corrections