Fixes to the scraper