Some haddock improvements