Fix api calls