Upgrade follow up and bug fixes.