Two small changes to fix failed student report bugs [12221778]