more 5.0 upgrade fixes