more small API tweaks