Scraping tweaks