fixing API breakages