Tweaks for upgrade process