Fixed a couple of rare source conditions during scraping