Grade scraping tweaks