Fixes for the haddock documentation