fix more macros