Minor performance improvements for autosave