Fixes for gamestate/playerstate