Gamestate fixes