diff --git a/src/helpers/radiolib/CustomSTM32WLxWrapper.h b/src/helpers/radiolib/CustomSTM32WLxWrapper.h
index e3e52029..c6caa3a4 100644
--- a/src/helpers/radiolib/CustomSTM32WLxWrapper.h
+++ b/src/helpers/radiolib/CustomSTM32WLxWrapper.h
@@ -23,4 +23,11 @@ public:
   }
 
   void doResetAGC() override { sx126xResetAGC((SX126x *)_radio); }
+
+  uint8_t getCodingRate() const override {
+    return ((CustomSTM32WLx *)_radio)->codingRate + 4;
+  }
+  float getFreqMHz() const override {
+    return ((CustomSTM32WLx *)_radio)->freqMHz;
+  }
 };
diff --git a/src/helpers/radiolib/RadioLibWrappers.cpp b/src/helpers/radiolib/RadioLibWrappers.cpp
index e4f9e566..79d211d6 100644
--- a/src/helpers/radiolib/RadioLibWrappers.cpp
+++ b/src/helpers/radiolib/RadioLibWrappers.cpp
@@ -2,6 +2,13 @@
 #define RADIOLIB_STATIC_ONLY 1
 #include "RadioLibWrappers.h"
 
+// Platform-safe yield for use in busy-wait loops
+#ifdef NRF52_PLATFORM
+  #define YIELD_TASK() vTaskDelay(1)
+#else
+  #define YIELD_TASK() delay(1)
+#endif
+
 #define STATE_IDLE       0
 #define STATE_RX         1
 #define STATE_TX_WAIT    3
@@ -194,17 +201,17 @@ bool RadioLibWrapper::isChannelActive() {
         uint32_t max_backoff = min(base_ms * (1u << _busy_count), (uint32_t)16000);
         uint32_t backoff_until = millis() + random(max_backoff / 2, max_backoff);
         while (millis() < backoff_until) {
-          vTaskDelay(1);
+          YIELD_TASK();
         }
         return true;
       }
-      vTaskDelay(1);
+      YIELD_TASK();
     }
     // Channel free: reset busy counter and add small jitter
     _busy_count = 0;
     uint32_t jitter_until = millis() + random(0, 500);
     while (millis() < jitter_until) {
-      vTaskDelay(1);
+      YIELD_TASK();
     }
     return false;
   }
diff --git a/src/helpers/radiolib/RadioLibWrappers.h b/src/helpers/radiolib/RadioLibWrappers.h
index 8c3a6e74..6c1035de 100644
--- a/src/helpers/radiolib/RadioLibWrappers.h
+++ b/src/helpers/radiolib/RadioLibWrappers.h
@@ -39,9 +39,9 @@ public:
   }
 
   virtual float getCurrentRSSI() =0;
-  virtual uint8_t getCodingRate() const = 0;
-  virtual float getFreqMHz() const = 0;
-
+  virtual uint8_t getCodingRate() const { return 8; }   // default CR4/8, override in subclass
+  virtual float getFreqMHz() const { return 0.0f; }     // default unknown, override in subclass
+						      //
   bool isJapanMode() const {
     float freq = getFreqMHz();
     return (fabsf(freq - 920.800f) < 0.05f ||