More upgrade fixes