some more _o replacements