fixed typos in re-defining macros