Fixing up stomped changes to main scene