Additional small tweaks to get the api up and running