More issues fixed in GameLogic