changes for ghc-7.4