Fixes to generate report