Update for ghc 7.4