Needed to make a couple of changes again, no idea why. Version control
is starting to get to me.
Getting rid of a few Ocaml warnings.