More upgrade fixes.