Changes to make haddock happy