fix more "extra qualification" errors