diff --git a/pydevices/RfxDevices/MARTE2_COMPONENT.py b/pydevices/RfxDevices/MARTE2_COMPONENT.py
index 9a890c2936..487d04c1dc 100644
--- a/pydevices/RfxDevices/MARTE2_COMPONENT.py
+++ b/pydevices/RfxDevices/MARTE2_COMPONENT.py
@@ -2738,6 +2738,8 @@ def getMarteInputInfo(self, threadMap, gams, dataSources, gamList, isSynch):
                 if outputDict['seg_len'] > 0:
                     gamText += '      '+outputDict['name'] + ' = {\n'
                     gamText += '        DataSource = '+dataSourceName+'_Output_DDB\n'
+                    gamText += '        NumberOfElemenrs = '+str(outputDict['elements'])
+                    gamText += '        Type = '+outputDict['type']
                     gamText += '      }\n'
 
             gamText += '    }\n'
@@ -2891,7 +2893,7 @@ def getMarteInputInfo(self, threadMap, gams, dataSources, gamList, isSynch):
             gamText += '  }\n'
             gams.append(gamText)
 
-        # Some outputs are connected to devices on separate synchronized theads
+        # Some outputs are connected to devices on separate synchronized threads
         if len(asynchThreadSignals) > 0:
             dataSourceText = '  +'+dataSourceName+'_Output_Asynch = {\n'
             dataSourceText += '    Class = RealTimeThreadAsyncBridge\n'
@@ -2910,11 +2912,11 @@ def getMarteInputInfo(self, threadMap, gams, dataSources, gamList, isSynch):
                     isInputStructField = False
                 gamText += '      '+signalDict['name']+' = {\n'
                 if isInputStructField:
-                    gamText += '        DataSource = '+gamName+'_Expanded_Output_DDB\n'
+                    gamText += '        DataSource = '+dataSourceName+'_Expanded_Output_DDB\n'
                 else:
-                    gamText += '        DataSource = '+gamName+'_Output_DDB\n'
-                gamText += '        NumberOfDimensions = ' + \
-                    str(signalDict['dimensions'])+'\n'
+                    gamText += '        DataSource = '+dataSourceName+'_Output_DDB\n'
+ #               gamText += '        NumberOfDimensions = ' + \
+ #                   str(signalDict['dimensions'])+'\n'
                 gamText += '        NumberOfElements = ' + \
                     str(signalDict['elements'])+'\n'
                 gamText += '      }\n'
@@ -2923,8 +2925,8 @@ def getMarteInputInfo(self, threadMap, gams, dataSources, gamList, isSynch):
             for signalDict in asynchThreadSignals:
                 gamText += '      '+signalDict['name']+' = {\n'
                 gamText += '        DataSource = '+dataSourceName+'_Output_Asynch\n'
-                gamText += '        NumberOfDimensions = ' + \
-                    str(signalDict['dimensions'])+'\n'
+ #               gamText += '        NumberOfDimensions = ' + \
+ #                   str(signalDict['dimensions'])+'\n'
                 gamText += '        NumberOfElements = ' + \
                     str(signalDict['elements'])+'\n'
                 gamText += '      }\n'
diff --git a/pydevices/RfxDevices/MARTE2_SUPERVISOR.py b/pydevices/RfxDevices/MARTE2_SUPERVISOR.py
index 3418c9a1f6..1cf6e4ee50 100644
--- a/pydevices/RfxDevices/MARTE2_SUPERVISOR.py
+++ b/pydevices/RfxDevices/MARTE2_SUPERVISOR.py
@@ -644,6 +644,11 @@ def stopMarte(self):
         # KILL MARTe process
         import subprocess
         import os
+
+        command = 'kill -KILL `ps -Af | grep %s_marte_configuration.cfg | grep MARTeApp.ex | grep -v grep | awk \'{print $2}\'`' % (marteName)
+        os.system(command)
+        return 1
+
         command = 'ps -Af | grep %s_marte_configuration.cfg | grep MARTeApp.ex | grep -v grep | awk \'{print $2}\'' % (
             marteName)
         pid, error = subprocess.Popen("{cmd}".format(
@@ -655,7 +660,6 @@ def stopMarte(self):
             for p in pid.split():
                 os.kill(int(p), 9)
                 print('MARTe Process PID : %s Killed\n' % (p))
-        return 1
 
     def check(self):
         t = self.getTree()