Internal API call tweaks, better handling of 404s etc