more fixes for compilation on Mac OS X with OCaml 4.02.0