OCamlbuild improvements