Various small fixes/improvements.
Various small fixes/improvements.

gerdstolpmann/ocaml,yunxing/ocaml,msprotz/ocaml,yunxing/ocaml,yunxing/ocaml,msprotz/ocaml,gerdstolpmann/ocaml,yunxing/ocaml,gerdstolpmann/ocaml,msprotz/ocaml,gerdstolpmann/ocaml,msprotz/ocaml,gerdstolpmann/ocaml,yunxing/ocaml,msprotz/ocaml