diff --git a/bsp_q7s/memory/SdCardManager.cpp b/bsp_q7s/memory/SdCardManager.cpp
index b336b84c..4ca11787 100644
--- a/bsp_q7s/memory/SdCardManager.cpp
+++ b/bsp_q7s/memory/SdCardManager.cpp
@@ -406,7 +406,7 @@ SdCardManager::OpStatus SdCardManager::checkCurrentOp(Operations& currentOp) {
   bool bytesRead = false;
 
 #if OBSW_ENABLE_TIMERS == 1
-  Countdown timer(100);
+  Countdown timer(1000);
 #endif
   while (true) {
     ReturnValue_t result = cmdExecutor.check(bytesRead);
diff --git a/bsp_q7s/memory/scratchApi.h b/bsp_q7s/memory/scratchApi.h
index babd26dc..96264995 100644
--- a/bsp_q7s/memory/scratchApi.h
+++ b/bsp_q7s/memory/scratchApi.h
@@ -75,7 +75,7 @@ ReturnValue_t readToFile(std::string name, std::ifstream& file, std::string& fil
 
   int result = std::system(oss.str().c_str());
   if (result != 0) {
-    if (result == 256) {
+    if (WEXITSTATUS(result) == 1) {
       sif::warning << "scratch::readNumber: Key " << name << " does not exist" << std::endl;
       // Could not find value
       std::remove(filename.c_str());
diff --git a/fsfw b/fsfw
index 3b497dbb..d63c01b9 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 3b497dbb8dae77f1cf28f50f7ba770c4256acd2d
+Subproject commit d63c01b96f2eb031eb4d568879dfee2e2151537a