Miscellaneous older GHC fixes