Fixed game end conditions