Fix up haskell bindings