oc: updates for 4.3