Assorted bug fixes in preparation for the final onCourse 7.0 release.