Few fixes in game server