Fix more endgame issues