! Fix a couple of issues with drafts (fixes #2468)

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

! Fix a couple of issues with drafts (fixes #2468)