! Fix a few errors with upgrade (fixes #2262)

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>