fix more broken stuff ;)