4.5alpha2 upgrade fixes