Minor bugfixes on game state reset