OP-421: Fixing build for OWF submodule.. due to conversions...