diff --git a/fsfw b/fsfw
index 73454c62..2de9e25c 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 73454c629c042de8efe7aa4fa6dcbf1e184b0961
+Subproject commit 2de9e25cebd3b0cfdac538b5c4dd88e0274ebbac
diff --git a/mission/tmtc/CCSDSHandler.cpp b/mission/tmtc/CCSDSHandler.cpp
index b3b03d40..26abec25 100644
--- a/mission/tmtc/CCSDSHandler.cpp
+++ b/mission/tmtc/CCSDSHandler.cpp
@@ -180,9 +180,9 @@ void CCSDSHandler::addVirtualChannel(VcId_t vcId, VirtualChannel* virtualChannel
   }
 }
 
-MessageQueueId_t CCSDSHandler::getReportReceptionQueue(uint8_t virtualChannel) {
+MessageQueueId_t CCSDSHandler::getReportReceptionQueue(uint8_t virtualChannel) const {
   if (virtualChannel < common::NUMBER_OF_VIRTUAL_CHANNELS) {
-    VirtualChannelMapIter iter = virtualChannelMap.find(virtualChannel);
+    auto iter = virtualChannelMap.find(virtualChannel);
     if (iter != virtualChannelMap.end()) {
       return iter->second->getReportReceptionQueue();
     } else {
diff --git a/mission/tmtc/CCSDSHandler.h b/mission/tmtc/CCSDSHandler.h
index 035f9e31..d76dbdaf 100644
--- a/mission/tmtc/CCSDSHandler.h
+++ b/mission/tmtc/CCSDSHandler.h
@@ -67,7 +67,7 @@ class CCSDSHandler : public SystemObject,
    */
   void addVirtualChannel(VcId_t virtualChannelId, VirtualChannel* virtualChannel);
 
-  MessageQueueId_t getReportReceptionQueue(uint8_t virtualChannel = 0);
+  MessageQueueId_t getReportReceptionQueue(uint8_t virtualChannel = 0) const override;
   ReturnValue_t getParameter(uint8_t domainId, uint8_t uniqueIdentifier,
                              ParameterWrapper* parameterWrapper, const ParameterWrapper* newValues,
                              uint16_t startAtIndex);
diff --git a/mission/tmtc/TmFunnel.cpp b/mission/tmtc/TmFunnel.cpp
index 49e9ba6e..7763bd45 100644
--- a/mission/tmtc/TmFunnel.cpp
+++ b/mission/tmtc/TmFunnel.cpp
@@ -25,7 +25,7 @@ TmFunnel::TmFunnel(object_id_t objectId, CdsShortTimeStamper& timeReader, uint32
 
 TmFunnel::~TmFunnel() {}
 
-MessageQueueId_t TmFunnel::getReportReceptionQueue(uint8_t virtualChannel) {
+MessageQueueId_t TmFunnel::getReportReceptionQueue(uint8_t virtualChannel) const {
   return tmQueue->getId();
 }
 
diff --git a/mission/tmtc/TmFunnel.h b/mission/tmtc/TmFunnel.h
index 325f3709..07f9382a 100644
--- a/mission/tmtc/TmFunnel.h
+++ b/mission/tmtc/TmFunnel.h
@@ -29,7 +29,7 @@ class TmFunnel : public AcceptsTelemetryIF, public ExecutableObjectIF, public Sy
   virtual ~TmFunnel();
 
   const char* getName() const override;
-  MessageQueueId_t getReportReceptionQueue(uint8_t virtualChannel = 0) override;
+  MessageQueueId_t getReportReceptionQueue(uint8_t virtualChannel = 0) const override;
   ReturnValue_t performOperation(uint8_t operationCode = 0) override;
   ReturnValue_t initialize() override;
 
diff --git a/mission/tmtc/VirtualChannel.cpp b/mission/tmtc/VirtualChannel.cpp
index 6ba404e4..96a37b3b 100644
--- a/mission/tmtc/VirtualChannel.cpp
+++ b/mission/tmtc/VirtualChannel.cpp
@@ -53,7 +53,7 @@ ReturnValue_t VirtualChannel::performOperation() {
   return result;
 }
 
-MessageQueueId_t VirtualChannel::getReportReceptionQueue(uint8_t virtualChannel) {
+MessageQueueId_t VirtualChannel::getReportReceptionQueue(uint8_t virtualChannel) const {
   return tmQueue->getId();
 }
 
diff --git a/mission/tmtc/VirtualChannel.h b/mission/tmtc/VirtualChannel.h
index b6ba8241..024ccee6 100644
--- a/mission/tmtc/VirtualChannel.h
+++ b/mission/tmtc/VirtualChannel.h
@@ -27,7 +27,7 @@ class VirtualChannel : public AcceptsTelemetryIF {
   VirtualChannel(uint8_t vcId, uint32_t tmQueueDepth, object_id_t ownerId);
 
   ReturnValue_t initialize();
-  MessageQueueId_t getReportReceptionQueue(uint8_t virtualChannel = 0) override;
+  MessageQueueId_t getReportReceptionQueue(uint8_t virtualChannel = 0) const override;
   ReturnValue_t performOperation();
 
   /**
diff --git a/tmtc b/tmtc
index 1dfc2fca..3cbfeb70 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 1dfc2fca2f58f8d226fab01c87eb529ba7ec8376
+Subproject commit 3cbfeb70156d2b60c2cce1fc28b4ace7f58e8af3