Minor API tweaks