Various bug fixes to new admin and grader commands