Old GHC fixes, take two