Changes from  comments in PR#442, in oc-project