Scraper fixes