Fixes to get the API scraper working