Tweaks to API