diff --git a/src/Makefile b/src/Makefile
index 3eb23860e..7f908ec3d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -485,8 +485,8 @@ ifeq ($(PCB), X9D)
   EEPROMSRC = eeprom_avr.cpp # TODO later eeprom_conversions.cpp
   PULSESSRC = pulses_arm.cpp
   CPPSRC += audio_arm.cpp
-  CPPSRC += x9d/pwr_driver.cpp x9d/pulses_driver.cpp x9d/keys_driver.cpp x9d/adc_driver.cpp x9d/trainer_driver.cpp x9d/audio_driver.cpp x9d/delays.cpp
-  CPPSRC += bmp.cpp monitors_views.cpp
+  CPPSRC += x9d/pwr_driver.cpp x9d/pulses_driver.cpp x9d/keys_driver.cpp x9d/adc_driver.cpp x9d/trainer_driver.cpp x9d/audio_driver.cpp x9d/delays.cpp x9d/uart_driver.cpp
+  CPPSRC += bmp.cpp monitors_views.cpp 
   SRC += x9d/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/CMSIS/Device/ST/STM32F2xx/Source/Templates/system_stm32f2xx.c
   SRC += x9d/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/src/stm32f2xx_gpio.c
   SRC += x9d/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/src/stm32f2xx_rcc.c
@@ -509,7 +509,6 @@ ifeq ($(PCB), X9D)
 
   ifeq ($(DEBUG), YES)
     CPPSRC += debug.cpp
-  	CPPSRC += x9d/debug_driver.cpp
   	SRC += sky9x/syscalls.c
   endif
 endif
diff --git a/src/translations/fr.h b/src/translations/fr.h
index f25268d84..0a4caeed5 100644
--- a/src/translations/fr.h
+++ b/src/translations/fr.h
@@ -411,7 +411,7 @@
 #define TR_BLOFFBRIGHTNESS     INDENT"Luminosit\200 OFF"
 #define TR_SPLASHSCREEN        "Ecran d'accueil"
 #define TR_THROTTLEWARNING     "Alerte gaz"
-#define TR_SWITCHWARNING       TR("Alerte Int","Alerte interrupt.")
+#define TR_SWITCHWARNING       TR("Alerte int","Alerte interrupt.")
 #define TR_TIMEZONE            "Fuseau horaire"
 #define TR_RXCHANNELORD        TR("Ordre voies RX","Ordre des voies pr\200f\200r\200")
 #define TR_SLAVE               "El\201ve"
@@ -509,7 +509,7 @@
 #define TR_CURRENT_CALIB       "Calib. Courant"
 #define TR_VOLTAGE             INDENT"Tension"
 #define TR_CURRENT             INDENT"Courant"
-#define TR_SELECT_MODEL        "S\200lect Mod\201le"
+#define TR_SELECT_MODEL        "S\200lect. Mod\201le"
 #define TR_CREATE_MODEL        "Cr\200er Mod\201le"
 #define TR_COPY_MODEL          "Copier Mod\201le"
 #define TR_MOVE_MODEL          "D\200placer Mod\201le"
diff --git a/src/x9d/board_x9d.cpp b/src/x9d/board_x9d.cpp
index a7047c7ff..920723197 100644
--- a/src/x9d/board_x9d.cpp
+++ b/src/x9d/board_x9d.cpp
@@ -103,6 +103,13 @@ void configure_pins( uint32_t pins, uint16_t config )
 }
 #endif
 
+#if defined(DEBUG)
+void debugPutc(const char c)
+{
+	uartPutc(c);
+}
+#endif
+
 uint8_t getTemperature()
 {
   return temperature + g_eeGeneral.temperatureCalib;
@@ -181,7 +188,7 @@ void boardInit()
   delaysInit();
   audioInit();
 #if defined(DEBUG)
-  debugInit();
+  uartInit(DEBUG_UART_BAUDRATE);
 #endif
 
   // TODO init_ppm() ;
diff --git a/src/x9d/board_x9d.h b/src/x9d/board_x9d.h
index 938e8ae50..9ad8cd99c 100644
--- a/src/x9d/board_x9d.h
+++ b/src/x9d/board_x9d.h
@@ -79,12 +79,11 @@ extern uint16_t sessionTimer;
 #define SLAVE_MODE() (0/*pwrCheck() == e_power_trainer*/)
 
 void delaysInit();
-void debugInit();
 
 #define DEBUG_UART_BAUDRATE 115200
 
-void uartInit(void);
-void uartSendChar(uint8_t c);
+void uartInit(uint32_t baudrate);
+void uartPutc(const char c);
 
 void delaysInit(void);
 void delay_01us(uint16_t nb);
diff --git a/src/x9d/debug_driver.cpp b/src/x9d/uart_driver.cpp
similarity index 92%
rename from src/x9d/debug_driver.cpp
rename to src/x9d/uart_driver.cpp
index ef5ae69c5..3d801c18e 100644
--- a/src/x9d/debug_driver.cpp
+++ b/src/x9d/uart_driver.cpp
@@ -36,7 +36,7 @@
 
 #include "../open9x.h"
 
-void debugInit(void)
+void uartInit(uint32_t baudrate)
 {
   USART_InitTypeDef USART_InitStructure;
   GPIO_InitTypeDef GPIO_InitStructure;
@@ -54,7 +54,7 @@ void debugInit(void)
   GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
   GPIO_Init(GPIO_UART, &GPIO_InitStructure);
   
-  USART_InitStructure.USART_BaudRate = DEBUG_UART_BAUDRATE;
+  USART_InitStructure.USART_BaudRate = baudrate;
   USART_InitStructure.USART_WordLength = USART_WordLength_8b;
   USART_InitStructure.USART_StopBits = USART_StopBits_1;
   USART_InitStructure.USART_Parity = USART_Parity_No;
@@ -65,7 +65,7 @@ void debugInit(void)
   USART_Cmd(UART_DEBUG, ENABLE);
 }
 
-void debugPutc(const char c)
+void uartPutc(const char c)
 {
   USART_SendData(UART_DEBUG, c);