upgrade fixes