fix more fixmes