Various changes to support scene save/load