Some changes using the ghc patch