Couple haskell-related changes