Fix scraping bugs