diff --git a/htest/Test/Ganeti/Luxi.hs b/htest/Test/Ganeti/Luxi.hs
index a788e59cfe40bca91ebe7c3de0e52c1dac44243c..8faf50ef3fb51ca93ffa818eb6e89a65868cffab 100644
--- a/htest/Test/Ganeti/Luxi.hs
+++ b/htest/Test/Ganeti/Luxi.hs
@@ -48,6 +48,8 @@ import Test.Ganeti.OpCodes ()
 import Ganeti.BasicTypes
 import qualified Ganeti.Luxi as Luxi
 
+{-# ANN module "HLint: ignore Use camelCase" #-}
+
 -- * Luxi tests
 
 $(genArbitrary ''Luxi.LuxiReq)
diff --git a/htools/Ganeti/HTools/CLI.hs b/htools/Ganeti/HTools/CLI.hs
index e2483a6c260188c58586d31dae9cdcbf37380c32..982a536224cbace9fa958f30fd179e85d7d1c302 100644
--- a/htools/Ganeti/HTools/CLI.hs
+++ b/htools/Ganeti/HTools/CLI.hs
@@ -336,7 +336,7 @@ genOLuxiSocket defSocket =
    OptComplFile)
 
 oLuxiSocket :: IO OptType
-oLuxiSocket = Path.defaultLuxiSocket >>= (return . genOLuxiSocket)
+oLuxiSocket = liftM genOLuxiSocket Path.defaultLuxiSocket
 
 oMachineReadable :: OptType
 oMachineReadable =
diff --git a/htools/Ganeti/Ssconf.hs b/htools/Ganeti/Ssconf.hs
index 9d345e3ea74daaf74c9036ada5552d98ad01051e..6853bb15a7c3da79d614c53bd88090e63d5564d0 100644
--- a/htools/Ganeti/Ssconf.hs
+++ b/htools/Ganeti/Ssconf.hs
@@ -86,7 +86,7 @@ $(declareSADT "SSKey"
 keyToFilename :: FilePath     -- ^ Config path root
               -> SSKey        -- ^ Ssconf key
               -> FilePath     -- ^ Full file name
-keyToFilename cfgpath key = do
+keyToFilename cfgpath key =
   cfgpath </> sSFilePrefix ++ sSKeyToRaw key
 
 -- | Runs an IO action while transforming any error into 'Bad'