Fixed some issues in Reporting