Minor bug fixes on game end