diff --git a/Language/Haskell/GhcMod/CabalApi.hs b/Language/Haskell/GhcMod/CabalApi.hs
index 3e8623c..6a1ac2a 100644
--- a/Language/Haskell/GhcMod/CabalApi.hs
+++ b/Language/Haskell/GhcMod/CabalApi.hs
@@ -70,7 +70,7 @@ problematicPackages = [
   ]
 
 attachPackageIds :: [Package] -> [PackageBaseName] -> [Package]
-attachPackageIds pkgs = catMaybes . fmap (flip lookup3 pkgs)
+attachPackageIds pkgs = catMaybes . fmap (`lookup3` pkgs)
 
 lookup3 :: Eq a => a -> [(a,b,c)] -> Maybe (a,b,c)
 lookup3 _ [] = Nothing
diff --git a/Language/Haskell/GhcMod/ErrMsg.hs b/Language/Haskell/GhcMod/ErrMsg.hs
index 6b2133d..59eb8d5 100644
--- a/Language/Haskell/GhcMod/ErrMsg.hs
+++ b/Language/Haskell/GhcMod/ErrMsg.hs
@@ -77,12 +77,12 @@ ppErrMsg dflag style err = ppMsg spn SevError dflag style msg ++ ext
    where
      spn = Gap.errorMsgSpan err
      msg = errMsgShortDoc err
-     ext = showMsg dflag style (errMsgExtraInfo err)
+     ext = showPage dflag style (errMsgExtraInfo err)
 
 ppMsg :: SrcSpan -> Severity-> DynFlags -> PprStyle -> SDoc -> String
 ppMsg spn sev dflag style msg = prefix ++ cts
   where
-    cts  = showMsg dflag style msg
+    cts  = showPage dflag style msg
     defaultPrefix
       | dopt Gap.dumpSplicesFlag dflag = ""
       | otherwise                      = "Dummy:0:0:Error:"
@@ -91,8 +91,3 @@ ppMsg spn sev dflag style msg = prefix ++ cts
         file <- normalise <$> Gap.getSrcFile spn
         let severityCaption = Gap.showSeverityCaption sev
         return $ file ++ ":" ++ show line ++ ":" ++ show col ++ ":" ++ severityCaption
-
-----------------------------------------------------------------
-
-showMsg :: DynFlags -> PprStyle -> SDoc -> String
-showMsg dflag style sdoc = showPage dflag style sdoc
diff --git a/Language/Haskell/GhcMod/GhcPkg.hs b/Language/Haskell/GhcMod/GhcPkg.hs
index eee9998..fa915f6 100644
--- a/Language/Haskell/GhcMod/GhcPkg.hs
+++ b/Language/Haskell/GhcMod/GhcPkg.hs
@@ -70,7 +70,7 @@ ghcPkgListEx dbs = do
     case rv of
       ExitFailure val -> do
           hPutStrLn stderr err
-          fail $ "ghc-pkg " ++ intercalate " " opts ++ " (exit " ++ show val ++ ")"
+          fail $ "ghc-pkg " ++ unwords opts ++ " (exit " ++ show val ++ ")"
       ExitSuccess -> return ()
 
     return $ parseGhcPkgOutput $ lines output