Small adjustments to sortByCourseOrder material