API changes and tweaks