fix more broken stuff