Modifications for building with ghc 7.7