fix more failures