Some more fixes for multi-game server