more CourseMode fixes