A few more tweaks to the API