Fixed some ocaml warnings
update from svn