change for ocaml 4
adapt to batteries 2 changes