OConly-81 fixes