More upgrade bugs :/

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

More upgrade bugs :/