Fix C++/OCaml wrappers.