Minor scraping tweaks