Updates for better string handling with OCaml 4.02