Tweaks to api