Fix some more OCaml-4-only issues