diff --git a/CHANGELOG.md b/CHANGELOG.md
index 43628dd6..50e56f44 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,15 @@ will consitute of a breaking change warranting a new major release:
 - `PAPB_EMPTY_SIGNAL_VC1` GPIO was not set up properly.
 - Fix for heater names: HPA heater (index 7) is now the Syrlinks heater.
 
+## Changed
+
+- More fixes and improvements for SD card handling. Extend SD card setup in core controller to
+  create full initial state for SD card manager are core controller as early as possible, turn
+  execution of setup file update blocking. This might solve the issue with the SD card manager
+  sometimes blocking for a long time.
+- Request raw MTM measurement twice for IMTQ, might reduce number of times measurement could not
+  be retrieved.
+
 # [v1.36.0] 2023-03-08
 
 eive-tmtc: v2.17.2
diff --git a/linux/devices/ImtqPollingTask.cpp b/linux/devices/ImtqPollingTask.cpp
index ad4b80ac..fbd5f847 100644
--- a/linux/devices/ImtqPollingTask.cpp
+++ b/linux/devices/ImtqPollingTask.cpp
@@ -120,6 +120,11 @@ void ImtqPollingTask::handleMeasureStep() {
     }
   }
 
+  // The I2C IP core on EIVE sometimes glitches out. Send start MTM measurement twice.
+  cmdBuf[0] = imtq::CC::START_MTM_MEASUREMENT;
+  if (i2cCmdExecMeasure(imtq::CC::START_MTM_MEASUREMENT) != returnvalue::OK) {
+    return;
+  }
   cmdBuf[0] = imtq::CC::START_MTM_MEASUREMENT;
   if (i2cCmdExecMeasure(imtq::CC::START_MTM_MEASUREMENT) != returnvalue::OK) {
     return;
@@ -177,6 +182,11 @@ void ImtqPollingTask::handleActuateStep() {
   TaskFactory::delayTask(10);
 
   cmdLen = 1;
+  // The I2C IP core on EIVE sometimes glitches out. Send start MTM measurement twice.
+  cmdBuf[0] = imtq::CC::START_MTM_MEASUREMENT;
+  if (i2cCmdExecActuate(imtq::CC::START_MTM_MEASUREMENT) != returnvalue::OK) {
+    return;
+  }
   cmdBuf[0] = imtq::CC::START_MTM_MEASUREMENT;
   if (i2cCmdExecActuate(imtq::CC::START_MTM_MEASUREMENT) != returnvalue::OK) {
     return;
diff --git a/mission/system/objects/AcsSubsystem.cpp b/mission/system/objects/AcsSubsystem.cpp
index e4969ac1..3bab5273 100644
--- a/mission/system/objects/AcsSubsystem.cpp
+++ b/mission/system/objects/AcsSubsystem.cpp
@@ -56,6 +56,7 @@ ReturnValue_t AcsSubsystem::initialize() {
 }
 
 void AcsSubsystem::performChildOperation() {
+  // sif::debug << "ACS system thread running" << std::endl;
   handleEventMessages();
   return Subsystem::performChildOperation();
 }