Improve compatibility with older GHC