Apply some additional minor Haddock fixes