StageGenerator fixes to be able to swap game objects