Errors in whole report fixed