Update for the new versions of GHC and base