4.5 upgrade fixes