Updates to please ghc-mod