Correct some breaking changes