Fixes to game loading