Fixes for raw web api calls