Fixed build for latest OPAM