Fix Haddock build problems
Merge pull request #1196 from david-christiansen/dos

Fix Haddock build problems