Minor haddock fixups