fix more dependency issues