Adapt to latest OPAM changes