fix more problems