Fixed API changes.