Tweaks for ghc-7.4.x