More fixes to Game Object