More fixes to the report