Merge "Minor text fixes." into oc-dev