Fixed end of game checks