Fixing things so that the Haskell client works.