diff --git a/latest/Firmware/Inc/config.h b/latest/Firmware/Inc/config.h
index cd7c11b..2c08721 100644
--- a/latest/Firmware/Inc/config.h
+++ b/latest/Firmware/Inc/config.h
@@ -60,7 +60,7 @@
 
 // Headroom above noise floor (in dB) that constitutes a clear channel for transmission
 #if FULL_RSSI_SAMPLING
-#define TX_CCA_HEADROOM                3
+#define TX_CCA_HEADROOM                6
 #else
 // When sampling RSSI sparsely, there is a tendency to overestimate the noise floor, so there is no need for headroom
 #define TX_CCA_HEADROOM                0
diff --git a/latest/Firmware/Src/Receiver.cpp b/latest/Firmware/Src/Receiver.cpp
index a7b9468..4e7ffa1 100644
--- a/latest/Firmware/Src/Receiver.cpp
+++ b/latest/Firmware/Src/Receiver.cpp
@@ -351,7 +351,7 @@ void Receiver::configureGPIOsForRX()
   gpiocfg.GPIO0 = 0x00;       // No change
   gpiocfg.GPIO1 = 0x14;       // RX data bits
   gpiocfg.GPIO2 = 0x00;       // No change
-  gpiocfg.GPIO3 = 0x1F;       // RX/TX data clock
+  gpiocfg.GPIO3 = 0x11;       // RX data clock
   gpiocfg.NIRQ  = 0x00;       // Nothing
   gpiocfg.SDO   = 0x00;       // No change
   gpiocfg.GENCFG = 0x00;      // No change
diff --git a/latest/Firmware/Src/Transceiver.cpp b/latest/Firmware/Src/Transceiver.cpp
index bf58ba0..c86f599 100644
--- a/latest/Firmware/Src/Transceiver.cpp
+++ b/latest/Firmware/Src/Transceiver.cpp
@@ -75,6 +75,7 @@ void Transceiver::configure()
   memcpy(p.Data, data, sizeof data);
   sendCmd(SET_PROPERTY, &p, 12, NULL, 0);
 
+  // These resulted from characterization with default BOM
   pa_params pwr;
   switch(mPartNumber)
   {