Two more fixes
Merge branch 'coursereviews'