Fixes breaking changes