diff --git a/Globals.h b/Globals.h
index ea1d7c7..bba702e 100644
--- a/Globals.h
+++ b/Globals.h
@@ -58,8 +58,8 @@ const uint8_t  MARK_NONE  = 0x00U;
 #include "P25TX.h"
 #include "Debug.h"
 
-const uint16_t TX_RINGBUFFER_SIZE = 100U;
-const uint16_t RX_RINGBUFFER_SIZE = 120U;
+const uint16_t TX_RINGBUFFER_SIZE = 512U;
+const uint16_t RX_RINGBUFFER_SIZE = 512U;
 
 extern MMDVM_STATE m_modemState;
 extern MMDVM_STATE m_modemState_prev;
diff --git a/SerialArduino.cpp b/SerialArduino.cpp
index 021bfbc..5aab5e8 100644
--- a/SerialArduino.cpp
+++ b/SerialArduino.cpp
@@ -62,7 +62,7 @@ int CSerialPort::availableInt(uint8_t n)
       return Serial1.available();
     #endif
     default:
-      return false;
+      return 0;
   }
 }
 
@@ -92,21 +92,19 @@ void CSerialPort::writeInt(uint8_t n, const uint8_t* data, uint16_t length, bool
     case 1U:
     #if defined(STM32_USART1_HOST) && defined(__STM32F1__)
       Serial1.write(data, length);
-      break;
     #else
       Serial.write(data, length);
       if (flush)
         Serial.flush();
-      break;
     #endif
+      break;
     case 3U:
     #if defined(SERIAL_REPEATER) && defined(__STM32F1__)
       Serial2.write(data, length);
-      break;
     #elif defined(SERIAL_REPEATER) && (defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__))
       Serial1.write(data, length);
-      break;
     #endif
+      break;
     default:
       break;
   }
diff --git a/SerialSTM.cpp b/SerialSTM.cpp
index 3762f92..e02ea81 100644
--- a/SerialSTM.cpp
+++ b/SerialSTM.cpp
@@ -52,7 +52,6 @@ extern "C" {
 
 /* ************* USART1 ***************** */
 
-volatile uint32_t intcount1;
 volatile uint8_t  TXSerialfifo1[TX_SERIAL_FIFO_SIZE];
 volatile uint8_t  RXSerialfifo1[RX_SERIAL_FIFO_SIZE];
 volatile uint16_t TXSerialfifohead1, TXSerialfifotail1;
@@ -139,7 +138,6 @@ void USART1_IRQHandler()
     }
 
     USART_ClearITPendingBit(USART1, USART_IT_RXNE);
-    intcount1++;
   }
 
   if (USART_GetITStatus(USART1, USART_IT_TXE)) {
@@ -208,7 +206,7 @@ void InitUSART1(int speed)
   RXSerialfifoinit1();
 }
 
-uint8_t AvailUSART1(void)
+uint8_t AvailUSART1()
 {
   if (RXSerialfifolevel1() > 0U)
     return 1U;
@@ -216,7 +214,7 @@ uint8_t AvailUSART1(void)
     return 0U;
 }
 
-uint8_t ReadUSART1(void)
+uint8_t ReadUSART1()
 {
   uint8_t data_c = RXSerialfifo1[RXSerialfifotail1];
 
@@ -245,7 +243,6 @@ extern "C" {
 
 /* ************* USART2 ***************** */
 
-volatile uint32_t intcount2;
 volatile uint8_t  TXSerialfifo2[TX_SERIAL_FIFO_SIZE];
 volatile uint8_t  RXSerialfifo2[RX_SERIAL_FIFO_SIZE];
 volatile uint16_t TXSerialfifohead2, TXSerialfifotail2;
@@ -317,7 +314,6 @@ uint8_t TXSerialfifoput2(uint8_t next)
 void USART2_IRQHandler()
 {
   uint8_t c;
-  io.DEB_pin(HIGH);
   
   if (USART_GetITStatus(USART2, USART_IT_RXNE)) {
     c = (uint8_t) USART_ReceiveData(USART2);
@@ -333,7 +329,6 @@ void USART2_IRQHandler()
     }
 
     USART_ClearITPendingBit(USART2, USART_IT_RXNE);
-    intcount2++;
   }
 
   if (USART_GetITStatus(USART2, USART_IT_TXE)) {
@@ -403,7 +398,7 @@ void InitUSART2(int speed)
   RXSerialfifoinit2();
 }
 
-uint8_t AvailUSART2(void)
+uint8_t AvailUSART2()
 {
   if (RXSerialfifolevel2() > 0U)
     return 1U;
@@ -411,7 +406,7 @@ uint8_t AvailUSART2(void)
     return 0U;
 }
 
-uint8_t ReadUSART2(void)
+uint8_t ReadUSART2()
 {
   uint8_t data_c = RXSerialfifo2[RXSerialfifotail2];
 
@@ -468,7 +463,7 @@ int CSerialPort::availableInt(uint8_t n)
       return AvailUSART2();
     #endif
     default:
-      return false;
+      return 0;
   }
 }
 
@@ -502,8 +497,8 @@ void CSerialPort::writeInt(uint8_t n, const uint8_t* data, uint16_t length, bool
       usbserial.write(data, length);
       if (flush)
         usbserial.flush();
-      break;
     #endif
+      break;
     #if defined(SERIAL_REPEATER)
     case 3U:
       WriteUSART2(data, length);