qc scraper fixes