diff --git a/misc/eclipse/fsfw-example-linux-debug.launch b/misc/eclipse/fsfw-example-linux-debug.launch
index f1d9c4f..c2ed248 100644
--- a/misc/eclipse/fsfw-example-linux-debug.launch
+++ b/misc/eclipse/fsfw-example-linux-debug.launch
@@ -28,5 +28,6 @@
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
         <listEntry value="4"/>
     </listAttribute>
+    <stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;/&gt;"/>
     <stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
 </launchConfiguration>
diff --git a/tmtc/config/hook_implementation.py b/tmtc/config/hook_implementation.py
index 49efd9e..b03d7fa 100644
--- a/tmtc/config/hook_implementation.py
+++ b/tmtc/config/hook_implementation.py
@@ -51,8 +51,8 @@ class FsfwHookBase(TmTcHookBase):
         pack_service_queue_user(service=service, op_code=op_code, service_queue=service_queue)
 
     def tm_user_factory_hook(self, raw_tm_packet: bytearray) -> Optional[PusTelemetry]:
-        from pus_tm.factory_hook import tm_user_factory_hook
-        return tm_user_factory_hook(raw_tm_packet=raw_tm_packet)
+         from pus_tm.factory_hook import tm_user_factory_hook
+         return tm_user_factory_hook(raw_tm_packet=raw_tm_packet)
 
     def get_object_ids(self) -> Dict[bytes, list]:
         from config.object_ids import get_object_ids
diff --git a/tmtc/tmtc_client_cli.py b/tmtc/tmtc_client_cli.py
old mode 100644
new mode 100755
index c852072..356f80a
--- a/tmtc/tmtc_client_cli.py
+++ b/tmtc/tmtc_client_cli.py
@@ -26,6 +26,7 @@ limitations under the License.
 
 @author     R. Mueller
 """
+import sys
 from config.hook_implementation import FsfwHookBase
 try:
     from tmtccmd.runner import run_tmtc_commander, initialize_tmtc_commander
@@ -34,6 +35,7 @@ except ImportError:
     initialize_tmtc_commander = None
     print("Python tmtccmd submodule not installed")
     print("Install with \"cd tmtccmd && python3 -m pip install -e .\" for interactive installation")
+    sys.exit(0)
 
 
 def main():
diff --git a/tmtc/tmtccmd b/tmtc/tmtccmd
index a259c5b..0d91e26 160000
--- a/tmtc/tmtccmd
+++ b/tmtc/tmtccmd
@@ -1 +1 @@
-Subproject commit a259c5b3bc71383e3bc09284d60c407d9b1d7c43
+Subproject commit 0d91e26bc576c2dea7769d16d3b5a8a8bc10482c