Upgrade final tweaks