Small fixes to the report and final build