Some changes to report generation