More autosave fixes