diff --git a/radio/src/audio_arm.cpp b/radio/src/audio_arm.cpp
index 7f1d92d52..6a6d84010 100644
--- a/radio/src/audio_arm.cpp
+++ b/radio/src/audio_arm.cpp
@@ -118,12 +118,12 @@ const char * audioFilenames[] = {
 
 uint64_t sdAvailableSystemAudioFiles = 0;
 uint32_t sdAvailablePhaseAudioFiles = 0;
-uint32_t sdAvailableSwitchAudioFiles = 0;
+uint64_t sdAvailableSwitchAudioFiles = 0;
 uint64_t sdAvailableLogicalSwitchAudioFiles = 0;
 
 #define MASK_SYSTEM_AUDIO_FILE(index)                 ((uint64_t)1 << index)
 #define MASK_PHASE_AUDIO_FILE(index, event)           ((uint32_t)1 << (2*index+event))
-#define MASK_SWITCH_AUDIO_FILE(index)                 ((uint32_t)1 << index)
+#define MASK_SWITCH_AUDIO_FILE(index)                 ((uint64_t)1 << index)
 #define MASK_LOGICAL_SWITCH_AUDIO_FILE(index, event)  ((uint64_t)1 << (2*index+event))
 
 bool isFileAvailable(const char * filename)
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index 7955f57b4..7b5a609de 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -1309,7 +1309,6 @@ getvalue_t getValue(uint8_t i)
 
 volatile GETSWITCH_RECURSIVE_TYPE s_last_switch_used = 0;
 volatile GETSWITCH_RECURSIVE_TYPE s_last_switch_value = 0;
-/* recursive function. stack as of today (16/03/2012) grows by 8bytes at each call, which is ok! */
 
 #if defined(CPUARM)
 uint32_t cswDelays[NUM_CSW];
@@ -1425,6 +1424,8 @@ void getSwitchesPosition(bool play)
 
 int16_t csLastValue[NUM_CSW];
 #define CS_LAST_VALUE_INIT -32768
+
+/* recursive function. stack as of today (16/03/2012) grows by 8bytes at each call, which is ok! */
 bool getSwitch(int8_t swtch)
 {
   bool result;