Fix report generation