Minor improvements/changes to save/load interface