diff --git a/src/DIRAC/FrameworkSystem/Client/ComponentInstaller.py b/src/DIRAC/FrameworkSystem/Client/ComponentInstaller.py
index 48bc0892cea..4ca39bd438b 100644
--- a/src/DIRAC/FrameworkSystem/Client/ComponentInstaller.py
+++ b/src/DIRAC/FrameworkSystem/Client/ComponentInstaller.py
@@ -674,7 +674,7 @@ def addDefaultOptionsToCS(
         """
         Add the section with the component options to the CS
         """
-        if mySetup is None:
+        if not mySetup:
             mySetup = self.setup
 
         if gConfig_o:
@@ -2403,7 +2403,7 @@ def installTornado(self):
             os.chmod(runFile, self.gDefaultPerms)
 
         except Exception:
-            error = "Failed to prepare self.setup forTornado"
+            error = "Failed to prepare self.setup for Tornado"
             gLogger.exception(error)
             if self.exitOnError:
                 DIRAC.exit(-1)
diff --git a/src/DIRAC/FrameworkSystem/Client/SystemAdministratorClientCLI.py b/src/DIRAC/FrameworkSystem/Client/SystemAdministratorClientCLI.py
index 3cb4c4e0981..1033c0243de 100644
--- a/src/DIRAC/FrameworkSystem/Client/SystemAdministratorClientCLI.py
+++ b/src/DIRAC/FrameworkSystem/Client/SystemAdministratorClientCLI.py
@@ -738,7 +738,7 @@ def do_install(self, args):
                     system,
                     component,
                     extensionsByPriority(),
-                    specialOptions,
+                    specialOptions=specialOptions,
                     addDefaultOptions=True,
                 )
             else:
diff --git a/src/DIRAC/WorkloadManagementSystem/ConfigTemplate.cfg b/src/DIRAC/WorkloadManagementSystem/ConfigTemplate.cfg
index 698646cdefd..b619a2cba9f 100644
--- a/src/DIRAC/WorkloadManagementSystem/ConfigTemplate.cfg
+++ b/src/DIRAC/WorkloadManagementSystem/ConfigTemplate.cfg
@@ -26,13 +26,13 @@ Services
     Authorization
     {
       Default = authenticated
-      sendMessage = "Operator"
-      sendMessage += "GenericPilot"
-      getMetadata = "Operator"
-      getMetadata += "TrustedHost"
-      finaliseLogs = "Operator"
-      finaliseLogs += "Pilot"
-      finaliseLogs += "GenericPilot"
+      sendMessage = Operator
+      sendMessage += GenericPilot
+      getMetadata = Operator
+      getMetadata += TrustedHost
+      finaliseLogs = Operator
+      finaliseLogs += Pilot
+      finaliseLogs += GenericPilot
     }
   }
   ##END