Yet more opam fixes