Some API changes.