Fix Autosave conditions