diff --git a/OBSW_TmTcClient.py b/OBSW_TmTcClient.py
index 13c98cbcff279d5055dcce9c6102f8a22ada9e46..a1c9c9069007ed9e0505c3db211f338a98ca9e4d 100644
--- a/OBSW_TmTcClient.py
+++ b/OBSW_TmTcClient.py
@@ -168,8 +168,7 @@ def setCommunicationInterface(tmtcPrinter: TmTcPrinterT) -> ComIF_T:
             communicationInterface = SerialComIF(tmtcPrinter=tmtcPrinter, comPort=comPort, baudRate=baudRate,
                                                  serialTimeout=g.serialTimeout)
         else:
-            print("Could not set up communication interface !")
-            exit()
+            pass
         return communicationInterface
     except (IOError, OSError):
         print("Error setting up communication interface")
diff --git a/config/OBSW_Config.py b/config/OBSW_Config.py
index d4f1ca66dae854425a44f04958b09f084be1bb58..4088c2699469d0859ff2f5cdc914b0724d315b25 100644
--- a/config/OBSW_Config.py
+++ b/config/OBSW_Config.py
@@ -13,7 +13,7 @@ from typing import Tuple, TypeVar
 Global type definitions
 """
 ethernetAddressT = Tuple[str, int]
-socketType = TypeVar['socketType']
+# socketType = TypeVar['socketType']
 
 
 # Mode options, set by args parser
@@ -89,7 +89,18 @@ def setGlobals(args):
     portSend = 7
     sendAddressToSet = (args.boardIP, portSend)
     if 0 <= args.mode <= 5:
-        modeId = modeList[args.mode]
+        if args.mode == 0:
+           modeId = modeList.GUIMode
+        elif args.mode == 1:
+            modeId = modeList.ListenerMode
+        elif args.mode == 2:
+            modeId = modeList.SingleCommandMode
+        elif args.mode == 3:
+            modeId = modeList.ServiceTestMode
+        elif args.mode == 4:
+            modeId = modeList.SoftwareTestMode
+        elif args.mode == 5:
+            modeId = modeList.UnitTest
     else:
         print("Invalid mode argument, setting default mode (1)")
         modeId = modeList[1]
diff --git a/sendreceive/OBSW_TmListener.py b/sendreceive/OBSW_TmListener.py
index 01848bb859fca06243023596ea50323516662bde..22e356a35e93c441e49a9e03c6fbdb3e53db372a 100644
--- a/sendreceive/OBSW_TmListener.py
+++ b/sendreceive/OBSW_TmListener.py
@@ -31,7 +31,7 @@ class TmListener:
         self.tcTimeoutFactor = tcTimeoutFactor
         self.comInterface = comInterface
         # this will be the default mode (listener mode)
-        self.modeId = g.modeList[1]
+        self.modeId = g.modeList.ListenerMode
         self.listenerActive = threading.Event()  # TM Listener operations can be suspended by setting this flag
         self.listenerActive.set()
         # I don't think a listener is useful without the main program, so we might just declare it daemonic.
@@ -67,7 +67,7 @@ class TmListener:
             self.modeChangeEvent.clear()
             while not self.modeOpFinished.is_set():
                 self.performModeOperation()
-            self.modeId = g.modeList[1]
+            self.modeId = g.modeList.ListenerMode
 
     def performModeOperation(self):
         """
diff --git a/tc/OBSW_TcPacker.py b/tc/OBSW_TcPacker.py
index 5f11e002e7f0b9b8ff3ba9414630c08acfd750fe..5270ff66a934af07dbe9bab0ab12e7927fb17588 100644
--- a/tc/OBSW_TcPacker.py
+++ b/tc/OBSW_TcPacker.py
@@ -13,7 +13,7 @@ Run script with -s <Service or Device> -m 3 with optional -p parameter for file
 """
 import os
 
-from tc.OBSW_TcPacket import PUSTelecommand, pusTcTupleT
+from tc.OBSW_TcPacket import PUSTelecommand, tcQueueT
 from tc.OBSW_TcService2 import packService2TestInto
 from tc.OBSW_TcService3 import packService3TestInto
 from tc.OBSW_TcService8 import packService8TestInto
@@ -21,11 +21,7 @@ from tc.OBSW_TcService200 import packModeData, packService200TestInto
 import config.OBSW_Config as g
 from datetime import datetime
 from collections import deque
-from typing import Deque, Union, Tuple
-
-tcAuxiliaryTupleT = Tuple[str, any]
-# Union: Type can be either of those 2
-tcQueueT = Deque[Union[tcAuxiliaryTupleT, pusTcTupleT]]
+from typing import Union
 
 
 def serviceTestSelect(service: Union[int, str], serviceQueue: tcQueueT) -> tcQueueT:
diff --git a/tc/OBSW_TcPacket.py b/tc/OBSW_TcPacket.py
index bfa6e5a5d909d194c6d0d76e1f1a69a9eeebdb23..cc810d8fc43c36db72cf07f3e738e4b96d782af7 100644
--- a/tc/OBSW_TcPacket.py
+++ b/tc/OBSW_TcPacket.py
@@ -7,11 +7,14 @@ Created on Wed Apr  4 11:43:00 2018
 
 import crcmod
 import logging
-from typing import TypeVar, Dict, Tuple, Union
+from typing import TypeVar, Dict, Union, Tuple, Deque
 
 PusTcT = TypeVar('PusTcT', bound='PUSTelecommand')
 pusTcInfoT = Union[Dict[str, any], None]
 pusTcTupleT = Tuple[pusTcInfoT, bytearray]
+tcAuxiliaryTupleT = Tuple[str, any]
+# Union: Type can be either of those 2
+tcQueueT = Deque[Union[tcAuxiliaryTupleT, pusTcTupleT]]
 
 
 class PUSTelecommand:
diff --git a/test/OBSW_UnitTest.py b/test/OBSW_UnitTest.py
index 06cfb9745b218bd4d27f6de54cb7d455958e0657..fbbdc7e44153f065afcacd35fef2e390a2d07dac 100644
--- a/test/OBSW_UnitTest.py
+++ b/test/OBSW_UnitTest.py
@@ -74,7 +74,7 @@ class TestService(unittest.TestCase):
         cls.communicationInterface = None
         if g.comIF == 0:
             cls.communicationInterface = EthernetComIF(
-                tmtcPrinter=cls.tmtcPrinter,tmTimeout=g.tmTimeout, tcTimeoutFactor=g.tcSendTimeoutFactor,
+                tmtcPrinter=cls.tmtcPrinter, tmTimeout=g.tmTimeout, tcTimeoutFactor=g.tcSendTimeoutFactor,
                 sendAddress=g.sendAddress, receiveAddress=g.recAddress)
         else:
             baudRate = 115200