fixes for `make with-ocamlbuild` to work