Revert "Revert "oc fixes""

This reverts commit b9510585977295566c8c73297e4b63a86aa1f37a.