more scraper fixes