Fix all the breaking changes