More autosave fixes.