fixes for report generation