Small changes to Haskell API