Some GHC 7.7 fixes

These are some small changes made to get things building on 7.7.20130928.