Fixing up scrapers to match further