Minor fixes in scraper