extra/ghc some fixes