fix more fatals