Updated to build with ghc 7.6