diff --git a/radio/src/bluetooth.cpp b/radio/src/bluetooth.cpp
index 5dd28b1295..db0775beec 100644
--- a/radio/src/bluetooth.cpp
+++ b/radio/src/bluetooth.cpp
@@ -30,8 +30,8 @@
 #define BLUETOOTH_COMMAND_BAUD_115200  "TTM:BPS-115200"
 #endif
 
-extern Fifo<uint8_t, 64> btTxFifo;
-extern Fifo<uint8_t, 128> btRxFifo;
+extern Fifo<uint8_t, BT_TX_FIFO_SIZE> btTxFifo;
+extern Fifo<uint8_t, BT_RX_FIFO_SIZE> btRxFifo;
 
 Bluetooth bluetooth;
 
diff --git a/radio/src/gui/common/stdlcd/radio_power_meter.cpp b/radio/src/gui/common/stdlcd/radio_power_meter.cpp
index 54044dcaf8..34d71c3ae0 100644
--- a/radio/src/gui/common/stdlcd/radio_power_meter.cpp
+++ b/radio/src/gui/common/stdlcd/radio_power_meter.cpp
@@ -49,7 +49,7 @@ void menuRadioPowerMeter(event_t event)
   if (menuEvent) {
     lcdDrawCenteredText(LCD_H/2, STR_STOPPING);
     lcdRefresh();
-    moduleState[g_moduleIdx].mode = MODULE_MODE_NORMAL;
+    moduleState[g_moduleIdx].readModuleInformation(&reusableBuffer.moduleSetup.pxx2.moduleInformation, PXX2_HW_INFO_TX_ID, PXX2_HW_INFO_TX_ID);
     /* wait 1s to resume normal operation before leaving */
     watchdogSuspend(1000);
     RTOS_WAIT_MS(1000);
diff --git a/radio/src/gui/common/stdlcd/radio_spectrum_analyser.cpp b/radio/src/gui/common/stdlcd/radio_spectrum_analyser.cpp
index b686902d83..fbcec49c00 100644
--- a/radio/src/gui/common/stdlcd/radio_spectrum_analyser.cpp
+++ b/radio/src/gui/common/stdlcd/radio_spectrum_analyser.cpp
@@ -33,7 +33,7 @@ void menuRadioSpectrumAnalyser(event_t event)
   SUBMENU(STR_MENU_SPECTRUM_ANALYSER, 1, {1});
 
   if (TELEMETRY_STREAMING()) {
-    lcdDrawCenteredText(LCD_H/2, STR_TURN_OFF_RECEIVER          );
+    lcdDrawCenteredText(LCD_H/2, STR_TURN_OFF_RECEIVER);
     if (event == EVT_KEY_FIRST(KEY_EXIT)) {
       killEvents(event);
       popMenu();
@@ -42,9 +42,9 @@ void menuRadioSpectrumAnalyser(event_t event)
   }
 
   if (menuEvent) {
-    lcdDrawCenteredText(LCD_H/2, STR_STOPPING              );
+    lcdDrawCenteredText(LCD_H/2, STR_STOPPING);
     lcdRefresh();
-    moduleState[g_moduleIdx].mode = MODULE_MODE_NORMAL;
+    moduleState[g_moduleIdx].readModuleInformation(&reusableBuffer.moduleSetup.pxx2.moduleInformation, PXX2_HW_INFO_TX_ID, PXX2_HW_INFO_TX_ID);
     /* wait 1s to resume normal operation before leaving */
     watchdogSuspend(1000);
     RTOS_WAIT_MS(1000);