try to fix oc and other fixes