more upgrade fixes