Tiny API changes