Minor changes to save and load procedures