Fixes for grades