Haddock fixes.