diff --git a/flight/Modules/Telemetry/telemetry.c b/flight/Modules/Telemetry/telemetry.c
index e0f8b2d5f..57163c6e2 100644
--- a/flight/Modules/Telemetry/telemetry.c
+++ b/flight/Modules/Telemetry/telemetry.c
@@ -512,8 +512,11 @@ static void updateTelemetryStats()
  */
 static void updateSettings()
 {
+	
 	if (telemetryPort) {
-
+		PIOS_COM_ChangeBaud(telemetryPort, 115200);
+		return;
+		
 		// Retrieve settings
 		uint8_t speed;
 		HwSettingsTelemetrySpeedGet(&speed);
diff --git a/flight/Revolution/System/pios_board.c b/flight/Revolution/System/pios_board.c
index e9ce2ec16..1bc6af99d 100644
--- a/flight/Revolution/System/pios_board.c
+++ b/flight/Revolution/System/pios_board.c
@@ -1552,7 +1552,7 @@ void PIOS_Board_Init(void) {
 #if defined(PIOS_INCLUDE_GPS)
 
 	uint32_t pios_usart_gps_id;
-	if (PIOS_USART_Init(&pios_usart_gps_id, &pios_usart_gps_cfg)) {
+	if (PIOS_USART_Init(&pios_usart_gps_id, &pios_usart_telem_main_cfg)) {
 		PIOS_Assert(0);
 	}
 	
@@ -1593,7 +1593,7 @@ void PIOS_Board_Init(void) {
 #if defined(PIOS_INCLUDE_COM_TELEM)
 	{ /* Eventually add switch for this port function */
 		uint32_t pios_usart_telem_rf_id;
-		if (PIOS_USART_Init(&pios_usart_telem_rf_id, &pios_usart_telem_main_cfg)) {
+		if (PIOS_USART_Init(&pios_usart_telem_rf_id, &pios_usart_gps_cfg)) {
 			PIOS_Assert(0);
 		}