fix more bad imports