Tweaks/fixes related to custom fields on upgrade

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