Fixes for OCaml 4.02