Fix some GHC 7.6 issues