Fix build failures on GHC 7.4

Test will probably still fail