Final fixes for the Scraper task