Upgrade wizard refinements