haddock fixes