more oc6 style fixes