Fix minor API changes which break our code.