GameState fixes