Two more fixes
Merge branch 'coursereviews'
Merge branch 'master' into staging