Fixed glitches in scraper