fix more defs