Minor API changes