diff --git a/linux/payload/plocMpsocHelpers.h b/linux/payload/plocMpsocHelpers.h
index e4589667..53b9a5a1 100644
--- a/linux/payload/plocMpsocHelpers.h
+++ b/linux/payload/plocMpsocHelpers.h
@@ -463,15 +463,14 @@ class TcFlashFopen : public mpsoc::TcBase {
 
   ReturnValue_t setPayload(std::string filename, uint8_t mode) {
     accessMode = mode;
-    size_t nameSize = filename.size();
-    spParams.setFullPayloadLen(FILENAME_FIELD_SIZE + CRC_SIZE);
     ReturnValue_t result = checkPayloadLen();
     if (result != returnvalue::OK) {
       return result;
     }
     std::memset(payloadStart, 0, FILENAME_FIELD_SIZE);
-    std::memcpy(payloadStart, filename.c_str(), nameSize);
-    payloadStart[256] = accessMode;
+    std::memcpy(payloadStart, filename.c_str(), filename.size());
+    payloadStart[FILENAME_FIELD_SIZE] = accessMode;
+    spParams.setFullPayloadLen(FILENAME_FIELD_SIZE + 1 + CRC_SIZE);
     return returnvalue::OK;
   }
 
@@ -581,15 +580,6 @@ class TcFlashRead : public TcBase {
     if (result != returnvalue::OK) {
       return result;
     }
-    updateSpFields();
-    result = checkSizeAndSerializeHeader();
-    if (result != returnvalue::OK) {
-      return result;
-    }
-    result = calcAndSetCrc();
-    if (result != returnvalue::OK) {
-      return result;
-    }
     readSize = readLen;
     return result;
   }