Minor API changes.