Old GHC fixes, take three