Ontario scraper fixes