Grade export tweaks