Polishing up autosave implementation