haddock fixups