Fixes to compile with GHC 7.8

Currently still fails because recursion-schemes also needs fixes