oc fixes