Upgrade fixes.