Made changes to compile on current haskell-platform.