Improve GHC version support