Small API tweaks