Fix a few end of game errors