Scraper fixes and CA federal