fix more issues