address more breaking changes