Tweaks to the api