fixes to breaking changes