0.7.2 upgrade fixes