diff --git a/common/config/eive/definitions.h b/common/config/eive/definitions.h
index 9274878f..e4aa2daa 100644
--- a/common/config/eive/definitions.h
+++ b/common/config/eive/definitions.h
@@ -50,7 +50,7 @@ static constexpr uint32_t LEGACY_SA_DEPL_CHANNEL_ALTERNATION_INTERVAL_SECS = 5;
 // Maximum allowed burn time allowed by the software.
 static constexpr uint32_t SA_DEPL_MAX_BURN_TIME = 180;
 
-static constexpr size_t CFDP_MAX_FILE_SEGMENT_LEN = 990;
+static constexpr size_t CFDP_MAX_FILE_SEGMENT_LEN = 900;
 
 static constexpr uint32_t CCSDS_HANDLER_QUEUE_SIZE = 50;
 static constexpr uint8_t NUMBER_OF_VIRTUAL_CHANNELS = 4;
@@ -63,11 +63,11 @@ static constexpr uint32_t HK_STORE_QUEUE_SIZE = 300;
 static constexpr uint32_t CFDP_STORE_QUEUE_SIZE = 300;
 
 static constexpr uint32_t LIVE_CHANNEL_NORMAL_QUEUE_SIZE = 250;
-static constexpr uint32_t LIVE_CHANNEL_CFDP_QUEUE_SIZE = 400;
+static constexpr uint32_t LIVE_CHANNEL_CFDP_QUEUE_SIZE = 450;
 
-static constexpr uint32_t CFDP_MAX_FSM_CALL_COUNT_SRC_HANDLER = 60;
+static constexpr uint32_t CFDP_MAX_FSM_CALL_COUNT_SRC_HANDLER = 50;
 static constexpr uint32_t CFDP_MAX_FSM_CALL_COUNT_DEST_HANDLER = 300;
-static constexpr uint32_t CFDP_SHORT_DELAY_MS = 50;
+static constexpr uint32_t CFDP_SHORT_DELAY_MS = 40;
 static constexpr uint32_t CFDP_REGULAR_DELAY_MS = 200;
 
 static constexpr uint32_t MAX_PUS_FUNNEL_QUEUE_DEPTH = 100;
diff --git a/linux/ipcore/PapbVcInterface.cpp b/linux/ipcore/PapbVcInterface.cpp
index bc324489..c02d0935 100644
--- a/linux/ipcore/PapbVcInterface.cpp
+++ b/linux/ipcore/PapbVcInterface.cpp
@@ -49,10 +49,6 @@ ReturnValue_t PapbVcInterface::write(const uint8_t* data, size_t size, size_t& w
   } else {
     return DirectTmSinkIF::IS_BUSY;
   }
-  if (not pollReadyForOctet(MAX_BUSY_POLLS)) {
-    abortPacketTransfer();
-    return returnvalue::FAILED;
-  }
   return advanceWrite(writtenSize);
 }
 
@@ -75,7 +71,7 @@ ReturnValue_t PapbVcInterface::advanceWrite(size_t& writtenSize) {
   if (not pollReadyForPacket()) {
     return IS_BUSY;
   }
-  for (size_t idx = currentPacketIndex; idx < currentPacketSize; idx++) {
+  while (currentPacketIndex < currentPacketSize) {
     if (not pollReadyForOctet(MAX_BUSY_POLLS)) {
       if (not pollReadyForPacket()) {
         return PARTIALLY_WRITTEN;
@@ -83,7 +79,7 @@ ReturnValue_t PapbVcInterface::advanceWrite(size_t& writtenSize) {
       abortPacketTransfer();
       return returnvalue::FAILED;
     }
-    *(vcBaseReg + DATA_REG_OFFSET) = static_cast<uint32_t>(packetBuf[currentPacketIndex]);
+    *(vcBaseReg + DATA_REG_OFFSET) = static_cast<uint32_t>(packetBuf[currentPacketIndex++]);
     writtenSize++;
   }
   if (not pollReadyForOctet(MAX_BUSY_POLLS)) {
diff --git a/mission/com/LiveTmTask.cpp b/mission/com/LiveTmTask.cpp
index 48e7476c..56fe5a51 100644
--- a/mission/com/LiveTmTask.cpp
+++ b/mission/com/LiveTmTask.cpp
@@ -179,6 +179,9 @@ ReturnValue_t LiveTmTask::handleGenericTmQueue(MessageQueueIF& queue, bool isCfd
         sif::warning << "LiveTmTask: Synchronous write of last segment failed with code 0x"
                      << std::setw(4) << std::hex << result << std::dec << std::endl;
       }
+    } else if (result != returnvalue::OK) {
+      sif::error << "LiveTmTask: Channel write failed with code 0x" << std::hex << std::setw(4)
+                 << result << std::dec << std::endl;
     }
   }
   // Try delete in any case, ignore failures (which should not happen), it is more important to