incremental scrape fixes