More limp home handling