Fix rubric saving/handling