Minor scraper2 changes