Improvements to report generation