fix more import errors