diff --git a/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp b/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp
index 1c1f9fbd9..47425b24d 100644
--- a/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp
+++ b/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp
@@ -136,7 +136,7 @@ inline int geteepromsize() {
 #include "radio/src/translations/tts_sk.cpp"
 #include "radio/src/translations/tts_pl.cpp"
 #include "radio/src/translations/tts_hu.cpp"
-#include "radio/src/lua.cpp"
+#include "radio/src/lua_api.cpp"
 #include "radio/src/lua/src/lapi.c"
 #include "radio/src/lua/src/lcode.c"
 #include "radio/src/lua/src/lctype.c"
diff --git a/companion/src/firmwares/opentx/opentxTaranisX9ESimulator.cpp b/companion/src/firmwares/opentx/opentxTaranisX9ESimulator.cpp
index 2b83d85ee..795d09407 100755
--- a/companion/src/firmwares/opentx/opentxTaranisX9ESimulator.cpp
+++ b/companion/src/firmwares/opentx/opentxTaranisX9ESimulator.cpp
@@ -138,7 +138,7 @@ inline int geteepromsize() {
 #include "radio/src/translations/tts_sk.cpp"
 #include "radio/src/translations/tts_pl.cpp"
 #include "radio/src/translations/tts_hu.cpp"
-#include "radio/src/lua.cpp"
+#include "radio/src/lua_api.cpp"
 #include "radio/src/lua/src/lapi.c"
 #include "radio/src/lua/src/lcode.c"
 #include "radio/src/lua/src/lctype.c"
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index 7453e0822..cf26d952f 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -2720,9 +2720,6 @@ void opentxInit(OPENTX_INIT_ARGS)
 #endif
 
 #if defined(VOICE)
-#if defined(CPUARM)
-  currentSpeakerVolume = requiredSpeakerVolume = g_eeGeneral.speakerVolume+VOLUME_LEVEL_DEF;
-#endif
   setVolume(g_eeGeneral.speakerVolume+VOLUME_LEVEL_DEF);
 #endif
 
diff --git a/radio/src/targets/taranis/keys_driver.cpp b/radio/src/targets/taranis/keys_driver.cpp
index 6c36d5e46..5ce8d234b 100644
--- a/radio/src/targets/taranis/keys_driver.cpp
+++ b/radio/src/targets/taranis/keys_driver.cpp
@@ -45,6 +45,9 @@ uint32_t readKeys()
   register uint32_t f = GPIOF->IDR;
   register uint32_t result = 0;
 
+  (void)e;
+  (void)f;
+
 #if defined(REV9E)
   if (f & PIN_BUTTON_ENTER)
 #else
diff --git a/radio/src/tasks_arm.cpp b/radio/src/tasks_arm.cpp
index 6e2ae7dd8..613ac08da 100644
--- a/radio/src/tasks_arm.cpp
+++ b/radio/src/tasks_arm.cpp
@@ -37,7 +37,7 @@
 #include "opentx.h"
 
 static uint8_t currentSpeakerVolume = 255;
-uint8_t requiredSpeakerVolume;
+uint8_t requiredSpeakerVolume = 255;
 
 extern void checkBattery();