manually changed differnces from old version of ghc