Small tweaks for GHC 7.6.1 support