OSI report: fixes #20, fixes #21.