Map loading/game join improvements