Adjust to API changes.