diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90a1b3b2..09c6db91 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@ will consitute of a breaking change warranting a new major release:
 - The handling function of the GPS data is only called once per GPS read. This should remove
   the fake fix-has-changed events.
 - Fix for PLOC SUPV HK set parsing.
+- The timestamp for the `POSSIBLE_FILE_CORRUPTION` event will be generated properly now.
 
 ## Changed
 
diff --git a/bsp_q7s/em/emObjectFactory.cpp b/bsp_q7s/em/emObjectFactory.cpp
index 3c3ba290..976602d4 100644
--- a/bsp_q7s/em/emObjectFactory.cpp
+++ b/bsp_q7s/em/emObjectFactory.cpp
@@ -111,6 +111,7 @@ void ObjectFactory::produce(void* args) {
   new CoreController(objects::CORE_CONTROLLER, enableHkSets);
 
   auto* stackHandler = new Stack5VHandler(*pwrSwitcher);
+  static_cast<void>(stackHandler);
 
   // Initialize chip select to avoid SPI bus issues.
   createRadSensorChipSelect(gpioComIF);
diff --git a/mission/tmtc/PersistentTmStore.cpp b/mission/tmtc/PersistentTmStore.cpp
index 2f884dac..160348cd 100644
--- a/mission/tmtc/PersistentTmStore.cpp
+++ b/mission/tmtc/PersistentTmStore.cpp
@@ -320,6 +320,7 @@ ReturnValue_t PersistentTmStore::loadNextDumpFile() {
     }
     // File will change, reset this field for correct state-keeping.
     dumpParams.currentSameFileIdx = std::nullopt;
+    dumpParams.currentFileUnixStamp = dumpParams.dumpIter->epoch;
     // Increment iterator for next cycle.
     dumpParams.dumpIter++;
   };