A whole slew of bugfixes for the OSI report.