diff --git a/.run/tmtcgui.run.xml b/.run/tmtcgui.run.xml
index 845b1c6..0471dac 100644
--- a/.run/tmtcgui.run.xml
+++ b/.run/tmtcgui.run.xml
@@ -13,7 +13,7 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtcgui.py" />
-    <option name="PARAMETERS" value="" />
+    <option name="PARAMETERS" value="-l" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
     <option name="MODULE_MODE" value="false" />
diff --git a/pus_tc/system/proc.py b/pus_tc/system/proc.py
index f4e513b..7355c75 100644
--- a/pus_tc/system/proc.py
+++ b/pus_tc/system/proc.py
@@ -271,7 +271,7 @@ def pack_proc_commands(tc_queue: TcQueueT, op_code: str):
 
     if op_code in OpCodes.TV_SETUP_TCS_FT_ON:
         # Enable scheduling
-        tc_queue.appendleft(generate_enable_tc_sched_cmd().pack_command_tuple())
+        tc_queue.appendleft(generate_enable_tc_sched_cmd(22).pack_command_tuple())
         # check whether tcs_assembly also has to be commanded to NORMAL Mode
         pack_tcs_sys_commands(
             tc_queue=tc_queue, op_code=TcsOpCodes.TCS_BOARD_ASS_NORMAL[0]
diff --git a/tmtcc.py b/tmtcc.py
index e704716..9f96990 100644
--- a/tmtcc.py
+++ b/tmtcc.py
@@ -2,6 +2,8 @@ import argparse
 import sys
 import traceback
 from typing import Optional
+from tmtccmd.config.definitions import CoreModeList
+from tmtccmd.config.globals import update_global, CoreGlobalIds
 
 try:
     import spacepackets
@@ -57,6 +59,8 @@ def tmtcc_post_args(
     ccsds_handler.add_tm_handler(apid=PUS_APID, handler=apid_handler)
     tmtccmd.setup(setup_args=setup_args)
     tmtccmd.add_ccsds_handler(ccsds_handler)
+    if use_gui:
+        update_global(CoreGlobalIds.MODE, CoreModeList.LISTENER_MODE)
     tmtc_backend = tmtccmd.create_default_tmtc_backend(
         setup_args=setup_args,
         tm_handler=ccsds_handler,
diff --git a/tmtccmd b/tmtccmd
index eaed332..2354f5d 160000
--- a/tmtccmd
+++ b/tmtccmd
@@ -1 +1 @@
-Subproject commit eaed332a69885c19912827eb71440e8562935d36
+Subproject commit 2354f5d2778c7681ddf6602766dd4e68b943e1c0
diff --git a/tmtcgui.py b/tmtcgui.py
index 6c8a1fd..df4f460 100755
--- a/tmtcgui.py
+++ b/tmtcgui.py
@@ -1,6 +1,9 @@
 #!/usr/bin/env python3
 """TMTC commander for EIVE"""
-from tmtcc import tmtcc_post_args, tmtcc_pre_args
+from tmtcc import (
+    tmtcc_post_args,
+    tmtcc_pre_args
+)
 
 
 def main():