diff --git a/fsfw b/fsfw
index 9fca7581..6650c293 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 9fca7581dd75d074df343802c922e48f95b677eb
+Subproject commit 6650c293da09d8851c2bd6c4d6e6c5a8390d003e
diff --git a/mission/system/acs/AcsBoardAssembly.cpp b/mission/system/acs/AcsBoardAssembly.cpp
index befe82e0..fdc6053d 100644
--- a/mission/system/acs/AcsBoardAssembly.cpp
+++ b/mission/system/acs/AcsBoardAssembly.cpp
@@ -288,7 +288,7 @@ ReturnValue_t AcsBoardAssembly::checkAndHandleHealthStates(Mode_t deviceMode,
   } else if (healthHelper.healthTable->getHealth(helper.healthDevGps1) == PERMANENT_FAULTY and
              healthHelper.healthTable->getHealth(helper.healthDevGps0) == FAULTY) {
     overwriteDeviceHealth(helper.healthDevGps0, FAULTY);
-  } else if (healthHelper.healthTable->isFaulty(helper.healthDevGps0) or
+  } else if (healthHelper.healthTable->isFaulty(helper.healthDevGps0) and
              healthHelper.healthTable->isFaulty(helper.healthDevGps1)) {
     overwriteDeviceHealth(helper.healthDevGps0,
                           healthHelper.healthTable->getHealth(helper.healthDevGps0));
diff --git a/tmtc b/tmtc
index 6975fae5..50668ca7 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 6975fae511ca7b2fdef70858f8715908f300f434
+Subproject commit 50668ca7a74edd4219456e393cd10f7858591130