More scraper work