Some more API changes...