Fixed first two bugs in report