Some API tweaks