Old GHC fixes, take four