Fix failing end game states...