Fix HLint warnings
Fix build error for GHC 7.4