fix some breaking changes