Fix up scrapers