Spectator endgame fixes