! Fix bugs related to auto-saving drafts

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #1127 from Oldiesmann/release-2.1

! Fix bugs related to auto-saving drafts