diff --git a/FrameworkSystem/Client/ComponentInstaller.py b/FrameworkSystem/Client/ComponentInstaller.py
index d71901639d4..63baf94e43c 100644
--- a/FrameworkSystem/Client/ComponentInstaller.py
+++ b/FrameworkSystem/Client/ComponentInstaller.py
@@ -1130,7 +1130,7 @@ def getSetupComponents(self):
 
         for cType in self.componentTypes:
           if body.find('dirac-%s' % (cType)) != -1:
-            system, compT = component.split('_')[0:2]
+            system, compT = component.split('_', 1)
             if system not in resultDict[resultIndexes[cType]]:
               resultDict[resultIndexes[cType]][system] = []
             resultDict[resultIndexes[cType]][system].append(compT)
diff --git a/TransformationSystem/scripts/dirac-transformation-archive.py b/TransformationSystem/scripts/dirac-transformation-archive.py
index 08afe90b0f3..9cd3018bff7 100755
--- a/TransformationSystem/scripts/dirac-transformation-archive.py
+++ b/TransformationSystem/scripts/dirac-transformation-archive.py
@@ -5,14 +5,14 @@
 from __future__ import print_function
 import sys
 
-from DIRAC.Core.Base.Script import parseCommandLine
+from DIRAC.Core.Base.Script import parseCommandLine, getPositionalArgs
 parseCommandLine()
 
-if len( sys.argv ) < 2:
+if not getPositionalArgs():
   print('Usage: dirac-transformation-archive transID [transID] [transID]')
   sys.exit()
 else:
-  transIDs = [int( arg ) for arg in sys.argv[1:]]
+  transIDs = [int(arg) for arg in getPositionalArgs()]
 
 from DIRAC.TransformationSystem.Agent.TransformationCleaningAgent     import TransformationCleaningAgent
 from DIRAC.TransformationSystem.Client.TransformationClient           import TransformationClient
diff --git a/TransformationSystem/scripts/dirac-transformation-clean.py b/TransformationSystem/scripts/dirac-transformation-clean.py
index ddc63836010..d9c5f5a48aa 100755
--- a/TransformationSystem/scripts/dirac-transformation-clean.py
+++ b/TransformationSystem/scripts/dirac-transformation-clean.py
@@ -5,18 +5,17 @@
 from __future__ import print_function
 import sys
 
-from DIRAC.Core.Base.Script import parseCommandLine
+from DIRAC.Core.Base.Script import parseCommandLine, getPositionalArgs
 parseCommandLine()
 
 from DIRAC.TransformationSystem.Agent.TransformationCleaningAgent     import TransformationCleaningAgent
 from DIRAC.TransformationSystem.Client.TransformationClient         import TransformationClient
 
-if len( sys.argv ) < 2:
+if not getPositionalArgs():
   print('Usage: dirac-transformation-clean transID [transID] [transID]')
   sys.exit()
 else:
-  transIDs = [int( arg ) for arg in sys.argv[1:]]
-
+  transIDs = [int(arg) for arg in getPositionalArgs()]
 
 agent = TransformationCleaningAgent( 'Transformation/TransformationCleaningAgent',
                                      'Transformation/TransformationCleaningAgent',
diff --git a/TransformationSystem/scripts/dirac-transformation-remove-output.py b/TransformationSystem/scripts/dirac-transformation-remove-output.py
index 332e91f7509..4f3d6353680 100755
--- a/TransformationSystem/scripts/dirac-transformation-remove-output.py
+++ b/TransformationSystem/scripts/dirac-transformation-remove-output.py
@@ -5,14 +5,14 @@
 from __future__ import print_function
 import sys
 
-from DIRAC.Core.Base.Script import parseCommandLine
+from DIRAC.Core.Base.Script import parseCommandLine, getPositionalArgs
 parseCommandLine()
 
-if len( sys.argv ) < 2:
+if not getPositionalArgs():
   print('Usage: dirac-transformation-remove-output transID [transID] [transID]')
   sys.exit()
 else:
-  transIDs = [int( arg ) for arg in sys.argv[1:]]
+  transIDs = [int(arg) for arg in getPositionalArgs()]
 
 from DIRAC.TransformationSystem.Agent.TransformationCleaningAgent     import TransformationCleaningAgent
 from DIRAC.TransformationSystem.Client.TransformationClient           import TransformationClient
diff --git a/TransformationSystem/scripts/dirac-transformation-verify-outputdata.py b/TransformationSystem/scripts/dirac-transformation-verify-outputdata.py
index c4a59a114c7..eaf6a20682e 100755
--- a/TransformationSystem/scripts/dirac-transformation-verify-outputdata.py
+++ b/TransformationSystem/scripts/dirac-transformation-verify-outputdata.py
@@ -5,14 +5,14 @@
 from __future__ import print_function
 import sys
 
-from DIRAC.Core.Base.Script import parseCommandLine
+from DIRAC.Core.Base.Script import parseCommandLine, getPositionalArgs
 parseCommandLine()
 
-if len( sys.argv ) < 2:
+if not getPositionalArgs():
   print('Usage: dirac-transformation-verify-outputdata transID [transID] [transID]')
   sys.exit()
 else:
-  transIDs = [int( arg ) for arg in sys.argv[1:]]
+  transIDs = [int(arg) for arg in getPositionalArgs()]
 
 from DIRAC.TransformationSystem.Agent.ValidateOutputDataAgent       import ValidateOutputDataAgent
 from DIRAC.TransformationSystem.Client.TransformationClient         import TransformationClient