Fix bugs found in testing (Level and Report)