diff --git a/.github/workflows/build_all_apps.yml b/.github/workflows/build_all_apps.yml
index 6abddb7bb..7fb5d0c19 100644
--- a/.github/workflows/build_all_apps.yml
+++ b/.github/workflows/build_all_apps.yml
@@ -16,7 +16,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install tomlq
         run: |
@@ -96,14 +96,14 @@ jobs:
 
     steps:
       - name: Clone App
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: LedgerHQ/${{ matrix.repo_info.repo_name }}
           ref: ${{ matrix.repo_info.default_branch }}
           submodules: true
 
       - name: Clone SDK
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: sdk
           ref: ${{ inputs.sdk_branch }}
diff --git a/.github/workflows/check_clang_static_analyzer.yml b/.github/workflows/check_clang_static_analyzer.yml
index 27f9dc66c..62313a971 100644
--- a/.github/workflows/check_clang_static_analyzer.yml
+++ b/.github/workflows/check_clang_static_analyzer.yml
@@ -21,13 +21,13 @@ jobs:
 
     steps:
       - name: Clone Boilerplate
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: LedgerHQ/app-boilerplate
           ref: master
 
       - name: Clone SDK
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: sdk
 
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index a19076b13..15f858b8b 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -6,7 +6,7 @@ jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
           python-version: '3.10'
diff --git a/include/cx_errors.h b/include/cx_errors.h
index 2326c29fd..469a39e39 100644
--- a/include/cx_errors.h
+++ b/include/cx_errors.h
@@ -12,6 +12,7 @@
  * Check the error code of a function.
  * @hideinitializer
  */
+#ifdef HAVE_BOLOS
 #define CX_CHECK(call) \
     do {               \
         error = call;  \
@@ -19,6 +20,16 @@
             goto end;  \
         }              \
     } while (0)
+#else
+#define CX_CHECK(call)                                           \
+    do {                                                         \
+        error = call;                                            \
+        if (error) {                                             \
+            PRINTF("[CX_CHECK] - %s: %d\n", __FILE__, __LINE__); \
+            goto end;                                            \
+        }                                                        \
+    } while (0)
+#endif
 
 /**
  * Check the error code of a function and ignore