Fix in response to API changes.