Older GHC fixes