Update to build with GHC 7.8