Minor changes to how grades are created