Fix merge conflicts
Fix bad uses of course_id/location/locator in new code on master