Various small fixes to OSI report.