Changes to upgrade procedures