Various fixes to the game pointer management