Fixed upgrade issues

This should have the beta feature release at least MOSTLY functional . . .