Fix Haddock build problems