Haddock fixes