Fixes in scraping process