fix more random failures