Fixed a couple bugs in the finish game logic