Fixes to PDF report generation