diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml
index ebcaf4d1..f90823bf 100644
--- a/.github/workflows/build_multiplatform.yml
+++ b/.github/workflows/build_multiplatform.yml
@@ -114,8 +114,8 @@ jobs:
             distro: bullseye
             libcodec2_os_name: libcodec2_ubuntu-bullseye_armv7.so
           - arch: armv7
-            distro: ubuntu18.04
-            libcodec2_os_name: libcodec2_ubuntu-1804_armv7.so
+            distro: ubuntu20.04
+            libcodec2_os_name: libcodec2_ubuntu-2004_armv7.so
 
     steps:
       - uses: actions/checkout@v2.1.0
@@ -154,15 +154,18 @@ jobs:
             case "${{ matrix.distro }}" in
               ubuntu*|jessie|stretch|buster|bullseye)
                 apt-get update -q -y
-                apt-get install -q -y git build-essential cmake
+                apt-get install -q -y git build-essential cmake gcc g++
+                cmake --version
                 ;;
               fedora*)
                 dnf -y update
-                dnf -y install git which build-essential cmake
+                dnf -y install git which build-essential cmake gcc-c++ gcc
+                cmake --version
                 ;;
               alpine*)
                 apk update
-                apk add git build-essential cmake
+                apk add git build-essential cmake gcc g++
+                cmake --version
                 ;;
             esac
 
diff --git a/tnc/codec2.py b/tnc/codec2.py
index a8c2f441..18b5ee46 100644
--- a/tnc/codec2.py
+++ b/tnc/codec2.py
@@ -31,7 +31,6 @@ class FREEDV_MODE(Enum):
     fsk_ldpc_0 = 200
     fsk_ldpc_1 = 201
 
-
 # Function for returning the mode value
 def freedv_get_mode_value_by_name(mode: str) -> int:
     """
diff --git a/tnc/data_handler.py b/tnc/data_handler.py
index 0e858fc9..f3314785 100644
--- a/tnc/data_handler.py
+++ b/tnc/data_handler.py
@@ -805,7 +805,6 @@ class DATA:
 
         self.log.info(
             "[TNC] | TX | DATACHANNEL",
-            mode=FREEDV_MODE(mode).name,
             Bytes=static.TOTAL_BYTES,
         )
 
@@ -843,7 +842,7 @@ class DATA:
             # we have TX_N_MAX_RETRIES_PER_BURST attempts for sending a burst
             for self.tx_n_retry_of_burst in range(TX_N_MAX_RETRIES_PER_BURST):
                 data_mode = mode
-                self.log.debug("[TNC] FIXED MODE:", mode=FREEDV_MODE(data_mode).name)
+                # self.log.debug("[TNC] FIXED MODE:", mode=FREEDV_MODE(data_mode).name)
 
                 # we are doing a modulo check of transmission retries of the actual burst
                 # every 2nd retry which fails, decreases speedlevel by 1.