diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4a5cae85..70a496a4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,6 +24,10 @@ jobs:
     - name: Install libpng-dev
       run: sudo apt-get install libpng-dev
 
+    - name: Install locale
+      shell: bash
+      run: sudo locale-gen de_DE.UTF-8 && sudo update-locale
+
     - name: Create Build Environment
       # Some projects don't allow in-source building, so create a separate build directory
       # We'll use this as our working directory for all subsequent commands
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 125e5f39..7f69b7e8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -114,10 +114,6 @@ if(ZINT_SANITIZE)
             unset(CMAKE_REQUIRED_LIBRARIES)
         endforeach()
 
-        if(NOT ZINT_DEBUG AND CMAKE_C_COMPILER_ID MATCHES "GNU")
-            # Gives warning on MainWindow::setupUI() and retries (& takes forever) if var-tracking-assignments enabled
-            add_compile_options(-fno-var-tracking-assignments)
-        endif()
         if(CMAKE_C_COMPILER_ID MATCHES "Clang")
             # Recent clangs added deprecation warnings for `sprintf()` that are only triggered on sanitize - suppress
             add_compile_options(-Wno-deprecated-declarations)
diff --git a/backend/code128_based.c b/backend/code128_based.c
index 9d9e2759..ce58240a 100644
--- a/backend/code128_based.c
+++ b/backend/code128_based.c
@@ -188,11 +188,7 @@ INTERNAL int dpd(struct zint_symbol *symbol, unsigned char source[], int length)
     cd = mod + 1 - cd;
     if (cd == mod) cd = 0;
 
-    if (cd < 10) {
-        hrt[p] = cd + '0';
-    } else {
-        hrt[p] = (cd - 10) + 'A';
-    }
+    hrt[p] = xtoc(cd);
 
     hrt_cpy_nochk(symbol, hrt, p + 1);
 
diff --git a/backend/dxfilmedge.c b/backend/dxfilmedge.c
index 16e680e8..d670291c 100644
--- a/backend/dxfilmedge.c
+++ b/backend/dxfilmedge.c
@@ -258,7 +258,7 @@ INTERNAL int dxfilmedge(struct zint_symbol *symbol, unsigned char source[], int
     int error_number;
 
     char binary_output[32];
-    int output_length;
+    int output_length = 0; /* Suppress gcc warning -Wmaybe-uninitialized */
     int has_frame_info;
 
     const char long_clock_pattern[] = "1111101010101010101010101010111";