diff --git a/.github/workflows/build-cfs-deprecated.yml b/.github/workflows/build-cfs-deprecated.yml
index 3539c92f7..04a927ee8 100644
--- a/.github/workflows/build-cfs-deprecated.yml
+++ b/.github/workflows/build-cfs-deprecated.yml
@@ -198,7 +198,7 @@ jobs:
             fi
             counter=$(grep -c "BEGIN" cf/cfe_test.tmp)
             echo "Waiting for CFE Tests"
-            sleep 60
+            sleep 120
           done
 
           ../host/cmdUtil --endian=LE --pktid=0x1806 --cmdcode=2 --half=0x0002
diff --git a/.github/workflows/build-cfs.yml b/.github/workflows/build-cfs.yml
index 621421166..d9ab581ed 100644
--- a/.github/workflows/build-cfs.yml
+++ b/.github/workflows/build-cfs.yml
@@ -196,7 +196,7 @@ jobs:
             fi
             counter=$(grep -c "BEGIN" cf/cfe_test.tmp)
             echo "Waiting for CFE Tests"
-            sleep 60
+            sleep 120
           done
 
           ../host/cmdUtil --endian=LE --pktid=0x1806 --cmdcode=2 --half=0x0002
diff --git a/.github/workflows/format-check.yml b/.github/workflows/format-check.yml
index 44ce1b579..23c38d011 100644
--- a/.github/workflows/format-check.yml
+++ b/.github/workflows/format-check.yml
@@ -61,14 +61,6 @@ jobs:
           name: style_differences
           path: style_differences.txt
 
-      - name: Error on differences
-        run: |
-          if [[ -s style_differences.txt ]];
-          then
-            cat style_differences.txt
-            exit -1
-          fi
-
   check-commit-message:
     name: Check Commit Message
     needs: check-for-duplicates
diff --git a/cfe b/cfe
index b429d9130..2bf32994b 160000
--- a/cfe
+++ b/cfe
@@ -1 +1 @@
-Subproject commit b429d9130cd7ba5230a5070aa981cbdcb899b717
+Subproject commit 2bf32994b623307075c6dd854a3f9ce040d2457f
diff --git a/osal b/osal
index 5036fed76..184ba9bb4 160000
--- a/osal
+++ b/osal
@@ -1 +1 @@
-Subproject commit 5036fed76e440232016d7413cafdd2bb796144ce
+Subproject commit 184ba9bb40f6eea2d1aed0ea6d0e041cf47d6b45