Gradebook fixes