Support for OCaml 3.12: more fixes