Added hotfixes to scraper.