fix(report): Two more issues found so far