More scraper improvement