Fixes for latest haskell-platform