Fixing up some problems with the haddock doc generation