K1/fixes for gradesub