diff --git a/dmr/DMRDefines.h b/dmr/DMRDefines.h
index b871d3f..8da1010 100644
--- a/dmr/DMRDefines.h
+++ b/dmr/DMRDefines.h
@@ -126,7 +126,7 @@ namespace dmr
 
     const int8_t    DMR_MS_VOICE_SYNC_SYMBOLS_VALUES[] = { +3, -3, -3, -3, +3, -3, -3, +3, +3, +3, -3, +3, -3, +3, +3, +3, +3, -3, -3, +3, -3, -3, -3, +3 };
 
-    const uint32_t  DMR_TX_BUFFER_LEN = 1023U;          // 1023 = DMR_FRAME_LENGTH_BYTES * 31 (BUFFER_LEN = DMR_FRAME_LENGTH_BYTES * NO_OF_FRAMES)
+    const uint32_t  DMR_TX_BUFFER_LEN = 538U; // 538 = DMR_FRAME_LENGTH_BYTES * 16 + 10 (BUFFER_LEN = DMR_FRAME_LENGTH_BYTES * NO_OF_FRAMES + 10)
 
     // Data Type(s)
     const uint8_t   DT_VOICE_PI_HEADER = 0U;
diff --git a/nxdn/NXDNDefines.h b/nxdn/NXDNDefines.h
index fdb8dd1..8005db9 100644
--- a/nxdn/NXDNDefines.h
+++ b/nxdn/NXDNDefines.h
@@ -68,7 +68,7 @@ namespace nxdn
     const uint16_t  NXDN_FSW_SYMBOLS = 0x014DU;
     const uint16_t  NXDN_FSW_SYMBOLS_MASK = 0x03FFU;
 
-    const uint32_t  NXDN_TX_BUFFER_LEN = 2016U;         // 2016 = NXDN_FRAME_LENGTH_BYTES * 42 (BUFFER_LEN = NXDN_FRAME_LENGTH_BYTES * NO_OF_FRAMES)
+    const uint32_t  NXDN_TX_BUFFER_LEN = 1018U; // 2026 = NXDN_FRAME_LENGTH_BYTES * 21 + 10 (BUFFER_LEN = NXDN_FRAME_LENGTH_BYTES * NO_OF_FRAMES)
 } // namespace nxdn
 
 #endif // __NXDN_DEFINES_H__
diff --git a/nxdn/NXDNTX.cpp b/nxdn/NXDNTX.cpp
index 18731c2..5aad090 100644
--- a/nxdn/NXDNTX.cpp
+++ b/nxdn/NXDNTX.cpp
@@ -128,11 +128,6 @@ uint8_t NXDNTX::writeData(const uint8_t* data, uint16_t length)
 
     uint16_t space = m_fifo.getSpace();
     DEBUG3("NXDNTX: writeData(): dataLength/fifoLength", length, space);
-    if (space < length) {
-        m_fifo.reset();
-        return RSN_RINGBUFF_FULL;
-    }
-
     if (space < NXDN_FRAME_LENGTH_BYTES)
         return RSN_RINGBUFF_FULL;
 
diff --git a/p25/P25Defines.h b/p25/P25Defines.h
index 02b657b..dfa3841 100644
--- a/p25/P25Defines.h
+++ b/p25/P25Defines.h
@@ -120,7 +120,7 @@ namespace p25
     const uint32_t  P25_SYNC_SYMBOLS = 0x00FB30A0U;
     const uint32_t  P25_SYNC_SYMBOLS_MASK = 0x00FFFFFFU;
 
-    const uint32_t  P25_TX_BUFFER_LEN = 2592U;          // 2592 = P25_LDU_FRAME_LENGTH_BYTES * 12 (BUFFER_LEN = P25_LDU_FRAME_LENGTH_BYTES * NO_OF_FRAMES)
+    const uint32_t  P25_TX_BUFFER_LEN = 1738U; // 2592 = P25_LDU_FRAME_LENGTH_BYTES * 8 + 10 (BUFFER_LEN = P25_LDU_FRAME_LENGTH_BYTES * NO_OF_FRAMES + 10)
 
     // Data Unit ID(s)
     const uint8_t   P25_DUID_HDU = 0x00U;               // Header Data Unit
diff --git a/stm32f10x_link_debug.ld b/stm32f10x_link_debug.ld
index 56efe16..f65a82d 100644
--- a/stm32f10x_link_debug.ld
+++ b/stm32f10x_link_debug.ld
@@ -150,6 +150,19 @@ SECTIONS
     .debug_str      0 : { *(.debug_str) } > ROM
     .debug_loc      0 : { *(.debug_loc) } > ROM
     .debug_macinfo  0 : { *(.debug_macinfo) } > ROM
+    /* SGI/MIPS DWARF 2 extensions */
+    .debug_weaknames 0 : { *(.debug_weaknames) } > ROM
+    .debug_funcnames 0 : { *(.debug_funcnames) } > ROM
+    .debug_typenames 0 : { *(.debug_typenames) } > ROM
+    .debug_varnames  0 : { *(.debug_varnames) } > ROM
+    /* DWARF 3 */
+    .debug_pubtypes 0 : { *(.debug_pubtypes) } > ROM
+    .debug_ranges   0 : { *(.debug_ranges) } > ROM
+    /* DWARF Extension.  */
+    .debug_macro    0 : { *(.debug_macro) } > ROM
+    .debug_addr     0 : { *(.debug_addr) } > ROM
+    .ARM.attributes 0 : { KEEP (*(.ARM.attributes)) KEEP (*(.gnu.attributes)) } > ROM
+    .note.gnu.arm.ident 0 : { KEEP (*(.note.gnu.arm.ident)) } > ROM
 
 	/* Remove information from the standard libraries */
 	/DISCARD/ :
diff --git a/stm32f4xx_link_debug.ld b/stm32f4xx_link_debug.ld
index ef5ae55..9514d9b 100644
--- a/stm32f4xx_link_debug.ld
+++ b/stm32f4xx_link_debug.ld
@@ -158,6 +158,19 @@ SECTIONS
     .debug_str      0 : { *(.debug_str) } > ROM
     .debug_loc      0 : { *(.debug_loc) } > ROM
     .debug_macinfo  0 : { *(.debug_macinfo) } > ROM
+    /* SGI/MIPS DWARF 2 extensions */
+    .debug_weaknames 0 : { *(.debug_weaknames) } > ROM
+    .debug_funcnames 0 : { *(.debug_funcnames) } > ROM
+    .debug_typenames 0 : { *(.debug_typenames) } > ROM
+    .debug_varnames  0 : { *(.debug_varnames) } > ROM
+    /* DWARF 3 */
+    .debug_pubtypes 0 : { *(.debug_pubtypes) } > ROM
+    .debug_ranges   0 : { *(.debug_ranges) } > ROM
+    /* DWARF Extension.  */
+    .debug_macro    0 : { *(.debug_macro) } > ROM
+    .debug_addr     0 : { *(.debug_addr) } > ROM
+    .ARM.attributes 0 : { KEEP (*(.ARM.attributes)) KEEP (*(.gnu.attributes)) } > ROM
+    .note.gnu.arm.ident 0 : { KEEP (*(.note.gnu.arm.ident)) } > ROM
 
 	/* Remove information from the standard libraries */
 	/DISCARD/ :
diff --git a/stm32f7xx_link_debug.ld b/stm32f7xx_link_debug.ld
index 0f04653..9ff55db 100644
--- a/stm32f7xx_link_debug.ld
+++ b/stm32f7xx_link_debug.ld
@@ -157,6 +157,19 @@ SECTIONS
     .debug_str      0 : { *(.debug_str) } > ROM
     .debug_loc      0 : { *(.debug_loc) } > ROM
     .debug_macinfo  0 : { *(.debug_macinfo) } > ROM
+    /* SGI/MIPS DWARF 2 extensions */
+    .debug_weaknames 0 : { *(.debug_weaknames) } > ROM
+    .debug_funcnames 0 : { *(.debug_funcnames) } > ROM
+    .debug_typenames 0 : { *(.debug_typenames) } > ROM
+    .debug_varnames  0 : { *(.debug_varnames) } > ROM
+    /* DWARF 3 */
+    .debug_pubtypes 0 : { *(.debug_pubtypes) } > ROM
+    .debug_ranges   0 : { *(.debug_ranges) } > ROM
+    /* DWARF Extension.  */
+    .debug_macro    0 : { *(.debug_macro) } > ROM
+    .debug_addr     0 : { *(.debug_addr) } > ROM
+    .ARM.attributes 0 : { KEEP (*(.ARM.attributes)) KEEP (*(.gnu.attributes)) } > ROM
+    .note.gnu.arm.ident 0 : { KEEP (*(.note.gnu.arm.ident)) } > ROM
 
 	/* Remove information from the standard libraries */
 	/DISCARD/ :