diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a302d53..a2fdd3ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,11 @@ will consitute of a breaking change warranting a new major release:
 
 # [unreleased]
 
+## Fixed
+
+- SA deployment file handling: Use exceptionless API.
+- Fix deadlock in SD card manager constructor: Double lock of preferred SD card lock.
+
 ## Added
 
 - Failure of Safe Mode Ctrl will now trigger an event. As this can only be caused by sensors not
@@ -28,6 +33,7 @@ will consitute of a breaking change warranting a new major release:
 - I2C PST now has a polling frequency of 0.4 seconds instead of 0.2 seconds.
 - GS PST now has a polling frequency of 0.5 seconds instead of 1 second.
 - Bump FSFW: merged upstream.
+- Move BPX battery scheduling to ACS PST to avoid clashes with IMTQ scheduling / polling
 
 # [v1.37.2] 2023-03-14
 
diff --git a/bsp_q7s/core/scheduling.cpp b/bsp_q7s/core/scheduling.cpp
index d7094806..bd9ee01c 100644
--- a/bsp_q7s/core/scheduling.cpp
+++ b/bsp_q7s/core/scheduling.cpp
@@ -487,7 +487,7 @@ void scheduling::createPstTasks(TaskFactory& factory, TaskDeadlineMissedFunction
 #if OBSW_ADD_I2C_TEST_CODE == 0
   FixedTimeslotTaskIF* i2cPst = factory.createFixedTimeslotTask(
       "I2C_PST", 50, PeriodicTaskIF::MINIMUM_STACK_SIZE * 4, 0.4, missedDeadlineFunc);
-  result = pst::pstI2c(i2cPst);
+  result = pst::pstI2cProcessingSystem(i2cPst);
   if (result != returnvalue::OK) {
     if (result == FixedTimeslotTaskIF::SLOT_LIST_EMPTY) {
       sif::warning << "scheduling::initTasks: I2C PST is empty" << std::endl;
diff --git a/bsp_q7s/fs/SdCardManager.cpp b/bsp_q7s/fs/SdCardManager.cpp
index e954e7bb..29225899 100644
--- a/bsp_q7s/fs/SdCardManager.cpp
+++ b/bsp_q7s/fs/SdCardManager.cpp
@@ -37,7 +37,6 @@ SdCardManager::SdCardManager() : SystemObject(objects::SDC_MANAGER), cmdExecutor
       sif::warning << "CoreController::sdCardInit: "
                       "Preferred SD card not set. Setting to 0"
                    << std::endl;
-      setPreferredSdCard(sd::SdCard::SLOT_0);
       scratch::writeNumber(scratch::PREFERED_SDC_KEY, static_cast<uint8_t>(sd::SdCard::SLOT_0));
       prefSdRaw = sd::SdCard::SLOT_0;
 
diff --git a/mission/controller/AcsController.cpp b/mission/controller/AcsController.cpp
index 220ba178..e3a5ed5e 100644
--- a/mission/controller/AcsController.cpp
+++ b/mission/controller/AcsController.cpp
@@ -180,9 +180,11 @@ void AcsController::performSafe() {
     safeCtrlFailureCounter++;
     if (safeCtrlFailureCounter > 50) {
       safeCtrlFailureFlag = false;
+      safeCtrlFailureCounter = 0;
     }
   } else {
     safeCtrlFailureFlag = false;
+    safeCtrlFailureCounter = 0;
   }
 
   actuatorCmd.cmdDipolMtq(magMomMtq, cmdDipolMtqs,
diff --git a/mission/core/pollingSeqTables.cpp b/mission/core/pollingSeqTables.cpp
index 3b18a0e6..e69262bc 100644
--- a/mission/core/pollingSeqTables.cpp
+++ b/mission/core/pollingSeqTables.cpp
@@ -36,31 +36,25 @@ ReturnValue_t pst::pstSyrlinks(FixedTimeslotTaskIF *thisSequence) {
 
 // I don't think this needs to be in a PST because linux takes care of bus serialization, but
 // keep it like this for now, it works
-ReturnValue_t pst::pstI2c(FixedTimeslotTaskIF *thisSequence) {
+ReturnValue_t pst::pstI2cProcessingSystem(FixedTimeslotTaskIF *thisSequence) {
   // Length of a communication cycle
   uint32_t length = thisSequence->getPeriodMs();
   static_cast<void>(length);
-  thisSequence->addSlot(objects::BPX_BATT_HANDLER, length * 0.2,
-                        DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::BPX_BATT_HANDLER, length * 0.2, DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::BPX_BATT_HANDLER, length * 0.2, DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::BPX_BATT_HANDLER, length * 0.3, DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::BPX_BATT_HANDLER, length * 0.3, DeviceHandlerIF::GET_READ);
 
   // These are actually part of another bus, but this works, so keep it like this for now
-  thisSequence->addSlot(objects::TMP1075_HANDLER_TCS_0, length * 0.4,
+  thisSequence->addSlot(objects::TMP1075_HANDLER_TCS_0, length * 0.2,
                         DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::TMP1075_HANDLER_TCS_0, length * 0.4, DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::TMP1075_HANDLER_TCS_0, length * 0.4, DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::TMP1075_HANDLER_TCS_0, length * 0.45, DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::TMP1075_HANDLER_TCS_0, length * 0.45, DeviceHandlerIF::GET_READ);
+  thisSequence->addSlot(objects::TMP1075_HANDLER_TCS_0, length * 0.2, DeviceHandlerIF::SEND_WRITE);
+  thisSequence->addSlot(objects::TMP1075_HANDLER_TCS_0, length * 0.2, DeviceHandlerIF::GET_WRITE);
+  thisSequence->addSlot(objects::TMP1075_HANDLER_TCS_0, length * 0.3, DeviceHandlerIF::SEND_READ);
+  thisSequence->addSlot(objects::TMP1075_HANDLER_TCS_0, length * 0.3, DeviceHandlerIF::GET_READ);
 
-  thisSequence->addSlot(objects::TMP1075_HANDLER_TCS_1, length * 0.5,
+  thisSequence->addSlot(objects::TMP1075_HANDLER_TCS_1, length * 0.4,
                         DeviceHandlerIF::PERFORM_OPERATION);
-  thisSequence->addSlot(objects::TMP1075_HANDLER_TCS_1, length * 0.5, DeviceHandlerIF::SEND_WRITE);
-  thisSequence->addSlot(objects::TMP1075_HANDLER_TCS_1, length * 0.5, DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::TMP1075_HANDLER_TCS_1, length * 0.55, DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::TMP1075_HANDLER_TCS_1, length * 0.55, DeviceHandlerIF::GET_READ);
+  thisSequence->addSlot(objects::TMP1075_HANDLER_TCS_1, length * 0.4, DeviceHandlerIF::SEND_WRITE);
+  thisSequence->addSlot(objects::TMP1075_HANDLER_TCS_1, length * 0.4, DeviceHandlerIF::GET_WRITE);
+  thisSequence->addSlot(objects::TMP1075_HANDLER_TCS_1, length * 0.5, DeviceHandlerIF::SEND_READ);
+  thisSequence->addSlot(objects::TMP1075_HANDLER_TCS_1, length * 0.5, DeviceHandlerIF::GET_READ);
 
   thisSequence->addSlot(objects::TMP1075_HANDLER_PLPCDU_0, length * 0.6,
                         DeviceHandlerIF::PERFORM_OPERATION);
@@ -68,9 +62,9 @@ ReturnValue_t pst::pstI2c(FixedTimeslotTaskIF *thisSequence) {
                         DeviceHandlerIF::SEND_WRITE);
   thisSequence->addSlot(objects::TMP1075_HANDLER_PLPCDU_0, length * 0.6,
                         DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::TMP1075_HANDLER_PLPCDU_0, length * 0.65,
+  thisSequence->addSlot(objects::TMP1075_HANDLER_PLPCDU_0, length * 0.7,
                         DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::TMP1075_HANDLER_PLPCDU_0, length * 0.65,
+  thisSequence->addSlot(objects::TMP1075_HANDLER_PLPCDU_0, length * 0.7,
                         DeviceHandlerIF::GET_READ);
   // damaged
   /*
@@ -90,9 +84,9 @@ ReturnValue_t pst::pstI2c(FixedTimeslotTaskIF *thisSequence) {
                         DeviceHandlerIF::SEND_WRITE);
   thisSequence->addSlot(objects::TMP1075_HANDLER_IF_BOARD, length * 0.8,
                         DeviceHandlerIF::GET_WRITE);
-  thisSequence->addSlot(objects::TMP1075_HANDLER_IF_BOARD, length * 0.85,
+  thisSequence->addSlot(objects::TMP1075_HANDLER_IF_BOARD, length * 0.9,
                         DeviceHandlerIF::SEND_READ);
-  thisSequence->addSlot(objects::TMP1075_HANDLER_IF_BOARD, length * 0.85,
+  thisSequence->addSlot(objects::TMP1075_HANDLER_IF_BOARD, length * 0.9,
                         DeviceHandlerIF::GET_READ);
   static_cast<void>(length);
   return thisSequence->checkSequence();
@@ -562,6 +556,12 @@ ReturnValue_t pst::pstTcsAndAcs(FixedTimeslotTaskIF *thisSequence, AcsPstCfg cfg
                         DeviceHandlerIF::SEND_READ);
   thisSequence->addSlot(objects::PLPCDU_HANDLER, length * config::spiSched::SCHED_BLOCK_8_PERIOD,
                         DeviceHandlerIF::GET_READ);
+  thisSequence->addSlot(objects::BPX_BATT_HANDLER, length * config::spiSched::SCHED_BLOCK_8_PERIOD,
+                        DeviceHandlerIF::PERFORM_OPERATION);
+  thisSequence->addSlot(objects::BPX_BATT_HANDLER, length * config::spiSched::SCHED_BLOCK_8_PERIOD, DeviceHandlerIF::SEND_WRITE);
+  thisSequence->addSlot(objects::BPX_BATT_HANDLER, length * config::spiSched::SCHED_BLOCK_8_PERIOD, DeviceHandlerIF::GET_WRITE);
+  thisSequence->addSlot(objects::BPX_BATT_HANDLER, length * config::spiSched::SCHED_BLOCK_9_PERIOD, DeviceHandlerIF::SEND_READ);
+  thisSequence->addSlot(objects::BPX_BATT_HANDLER, length * config::spiSched::SCHED_BLOCK_9_PERIOD, DeviceHandlerIF::GET_READ);
 
 #if OBSW_ADD_RAD_SENSORS == 1
   /* Radiation sensor */
diff --git a/mission/core/pollingSeqTables.h b/mission/core/pollingSeqTables.h
index 75e18665..e3bc0ad0 100644
--- a/mission/core/pollingSeqTables.h
+++ b/mission/core/pollingSeqTables.h
@@ -51,7 +51,7 @@ ReturnValue_t pstSyrlinks(FixedTimeslotTaskIF* thisSequence);
 
 ReturnValue_t pstTcsAndAcs(FixedTimeslotTaskIF* thisSequence, AcsPstCfg cfg);
 
-ReturnValue_t pstI2c(FixedTimeslotTaskIF* thisSequence);
+ReturnValue_t pstI2cProcessingSystem(FixedTimeslotTaskIF* thisSequence);
 
 /**
  * Generic test PST
diff --git a/mission/devices/SolarArrayDeploymentHandler.cpp b/mission/devices/SolarArrayDeploymentHandler.cpp
index e4356630..aa471a1c 100644
--- a/mission/devices/SolarArrayDeploymentHandler.cpp
+++ b/mission/devices/SolarArrayDeploymentHandler.cpp
@@ -157,10 +157,14 @@ ReturnValue_t SolarArrayDeploymentHandler::performAutonomousDepl(sd::SdCard sdCa
   return returnvalue::OK;
 }
 
-bool SolarArrayDeploymentHandler::autonomousDeplForFile(sd::SdCard sdCard, const char* filename,
+bool SolarArrayDeploymentHandler::autonomousDeplForFile(sd::SdCard sdCard, const char* infoFile,
                                                         bool dryRun) {
   using namespace std;
-  ifstream file(filename);
+  std::error_code e;
+  ifstream file(infoFile);
+  if (file.bad()) {
+    return false;
+  }
   string line;
   string word;
   unsigned int lineNum = 0;
@@ -240,15 +244,18 @@ bool SolarArrayDeploymentHandler::autonomousDeplForFile(sd::SdCard sdCard, const
     }
   }
   if (deplState == AutonomousDeplState::DONE) {
-    remove(filename);
+    std::filesystem::remove(infoFile, e);
     if (sdCard == sd::SdCard::SLOT_0) {
-      remove(SD_0_DEPL_FILE);
+      std::filesystem::remove(SD_0_DEPL_FILE, e);
     } else {
-      remove(SD_1_DEPL_FILE);
+      std::filesystem::remove(SD_1_DEPL_FILE, e);
     }
     triggerEvent(AUTONOMOUS_DEPLOYMENT_COMPLETED);
   } else {
-    std::ofstream of(filename);
+    std::ofstream of(infoFile);
+    if (of.bad()) {
+      return false;
+    }
     of << "phase: ";
     if (deplState == AutonomousDeplState::INIT) {
       of << PHASE_INIT_STR << "\n";