fixes for Haskell2010