Update to work with new version of haskell