Fix game state stuff