Post-upgrade changes