Fixed promises within the api service calls