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
Trying to insert arrays doesn't work too well...

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

Trying to insert arrays doesn't work too well...
More upgrade bugs :/

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

More upgrade bugs :/