Adjustments for upgrade.