upgrade fixes...