Various fixes
Merge branch 'course-model'