corrections to the macros