Bug fixes for one_course handling