diff --git a/linux/fsfwconfig/OBSWConfig.h.in b/linux/fsfwconfig/OBSWConfig.h.in
index d54ab39a..a714e850 100644
--- a/linux/fsfwconfig/OBSWConfig.h.in
+++ b/linux/fsfwconfig/OBSWConfig.h.in
@@ -131,6 +131,8 @@ static constexpr uint8_t VC1_QUEUE_SIZE = 50;
 static constexpr uint8_t VC2_QUEUE_SIZE = 50;
 static constexpr uint8_t VC3_QUEUE_SIZE = 50;
 
+static constexpr uint8_t LIVE_TM = 0;
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/linux/obc/Ptme.h b/linux/obc/Ptme.h
index 753cc08f..be687e17 100644
--- a/linux/obc/Ptme.h
+++ b/linux/obc/Ptme.h
@@ -50,7 +50,7 @@ private:
 
 #if BOARD_TE0720 == 1
     /** Size of mapped address space */
-    static const int MAP_SIZE = 0x1000;
+    static const int MAP_SIZE = 0x40000;
 #else
     /** Size of mapped address space */
     static const int MAP_SIZE = 0x40000;
diff --git a/mission/utility/TmFunnel.cpp b/mission/utility/TmFunnel.cpp
index 5838ae75..4b9eebdf 100644
--- a/mission/utility/TmFunnel.cpp
+++ b/mission/utility/TmFunnel.cpp
@@ -101,7 +101,7 @@ ReturnValue_t TmFunnel::initialize() {
 
 #if OBSW_TM_TO_PTME == 1
 	// Live TM will be sent via the virtual channel 0
-	tmQueue->setDefaultDestination(tmTarget->getReportReceptionQueue(0));
+	tmQueue->setDefaultDestination(tmTarget->getReportReceptionQueue(config::LIVE_TM));
 #else
 	tmQueue->setDefaultDestination(tmTarget->getReportReceptionQueue());
 #endif /* OBSW_TM_TO_PTME == 1 */