Scraper fixes
Fixes from merge