Amend some things for scraper