Upgrade Functions

Fixes to upgrade functions.  More needs to be done
before 1.1 release; some functions may not be needed.