some api tweaks