fix more imports