Quick tweaks to the API