diff --git a/bsp_q7s/core/CoreController.cpp b/bsp_q7s/core/CoreController.cpp
index 7ee3191b..8977bab7 100644
--- a/bsp_q7s/core/CoreController.cpp
+++ b/bsp_q7s/core/CoreController.cpp
@@ -1224,6 +1224,9 @@ ReturnValue_t CoreController::handleProtInfoUpdateLine(std::string nextLine) {
       }
     }
     wordIdx++;
+    if(wordIdx >= 10) {
+      break;
+    }
   }
   return returnvalue::OK;
 }
diff --git a/mission/tmtc/PersistentTmStore.cpp b/mission/tmtc/PersistentTmStore.cpp
index 6ceed609..2e7da6f6 100644
--- a/mission/tmtc/PersistentTmStore.cpp
+++ b/mission/tmtc/PersistentTmStore.cpp
@@ -91,8 +91,8 @@ ReturnValue_t PersistentTmStore::handleCommandQueue(StorageManagerIF& ipcStore,
       if (accessor.second.size() < 8) {
         return returnvalue::FAILED;
       }
-      uint32_t dumpFromUnixSeconds;
-      uint32_t dumpUntilUnixSeconds;
+      uint32_t dumpFromUnixSeconds = 0;
+      uint32_t dumpUntilUnixSeconds = 0;
       size_t size = 8;
       SerializeAdapter::deSerialize(&dumpFromUnixSeconds, accessor.second.data(), &size,
                                     SerializeIF::Endianness::NETWORK);