fix more lookups