Fixes on GHC < 7.8