diff --git a/pyproject.toml b/pyproject.toml
index b5f75e8..7d6559c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -29,10 +29,10 @@ classifiers = [
     "Topic :: Scientific/Engineering"
 ]
 dependencies = [
-	"tmtccmd ~= 8.0.0rc1",
-  "cfdp-py~=0.1.0",
-	# "tmtccmd @ git+https://github.com/robamu-org/tmtccmd@main",
-	"python-dateutil ~= 2.8",
+  # "tmtccmd~=8.0.0rc2",
+  "cfdp-py~=0.1.1",
+  "tmtccmd @ git+https://github.com/robamu-org/tmtccmd@main",
+  "python-dateutil ~= 2.8",
 ]
 
 [project.urls]
diff --git a/tmtcc.py b/tmtcc.py
index 21bb912..d6b0b00 100755
--- a/tmtcc.py
+++ b/tmtcc.py
@@ -97,8 +97,8 @@ def setup_params() -> Tuple[SetupWrapper, int]:
         hk_level = int(post_arg_parsing_wrapper.args_raw.hk)
     else:
         hk_level = 0
-    if params.app_params.print_tree:
-        perform_tree_printout(params.app_params, hook_obj.get_command_definitions())
+    if params.tc_params.print_tree:
+        perform_tree_printout(params.tc_params, hook_obj.get_command_definitions())
         sys.exit(0)
     params.apid = PUS_APID
     if params.com_if is None:
@@ -232,6 +232,7 @@ def main():  # noqa C901: Complexity okay here.
             state = tmtc_backend.periodic_op(None)
             tc_handler.cfdp_in_ccsds_handler.state_machine()
             if state.request == BackendRequest.TERMINATION_NO_ERROR:
+                tmtc_backend.close_com_if()
                 sys.exit(0)
             elif state.request == BackendRequest.DELAY_IDLE:
                 _LOGGER.info("TMTC Client in IDLE mode")
@@ -252,6 +253,7 @@ def main():  # noqa C901: Complexity okay here.
             elif state.request == BackendRequest.CALL_NEXT:
                 pass
     except KeyboardInterrupt:
+        tmtc_backend.close_com_if()
         sys.exit(0)