Fix a few upgrade bugs, one of which was caused by #729

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

Fix a few upgrade bugs, one of which was caused by #729