diff --git a/DMRNetwork.cpp b/DMRNetwork.cpp
index 0b1edcf..8149019 100644
--- a/DMRNetwork.cpp
+++ b/DMRNetwork.cpp
@@ -87,8 +87,8 @@ m_beacon(false)
 	m_jitterBuffers[1U] = new CJitterBuffer("DMR Slot 1", 60U, DMR_SLOT_TIME, jitter, 256U, debug);
 	m_jitterBuffers[2U] = new CJitterBuffer("DMR Slot 2", 60U, DMR_SLOT_TIME, jitter, 256U, debug);
 
-	m_delayBuffers[1U] = new CDelayBuffer("DMR Slot 1", 60U, DMR_SLOT_TIME, jitter, debug);
-	m_delayBuffers[2U] = new CDelayBuffer("DMR Slot 2", 60U, DMR_SLOT_TIME, jitter, debug);
+	m_delayBuffers[1U] = new CDelayBuffer("DMR Slot 1", HOMEBREW_DATA_PACKET_LENGTH, DMR_SLOT_TIME, jitter, debug);
+	m_delayBuffers[2U] = new CDelayBuffer("DMR Slot 2", HOMEBREW_DATA_PACKET_LENGTH, DMR_SLOT_TIME, jitter, debug);
 
 	m_id[0U] = id >> 24;
 	m_id[1U] = id >> 16;
diff --git a/LCDproc.cpp b/LCDproc.cpp
index b9fc31b..d78a43a 100644
--- a/LCDproc.cpp
+++ b/LCDproc.cpp
@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2016,2017 by Tony Corbett G0WFV
+ *   Copyright (C) 2016,2017,2018 by Tony Corbett G0WFV
  *   Copyright (C) 2018 by Jonathan Naylor G4KLX
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -463,7 +463,7 @@ void CLCDproc::clearP25Int()
 {
 	m_clockDisplayTimer.stop();           // Stop the clock display
 
-	socketPrintf(m_socketfd, "widget_set P25 Line3 1 2 15 2 h 3 Listening");
+	socketPrintf(m_socketfd, "widget_set P25 Line2 1 2 15 2 h 3 Listening");
 	socketPrintf(m_socketfd, "widget_set P25 Line3 1 3 15 3 h 3 \"\"");
 	socketPrintf(m_socketfd, "widget_set P25 Line4 1 4 15 4 h 3 \"\"");
 	socketPrintf(m_socketfd, "output 2"); // Set LED2 color green
@@ -508,7 +508,7 @@ void CLCDproc::clearNXDNInt()
 {
 	m_clockDisplayTimer.stop();           // Stop the clock display
 
-	socketPrintf(m_socketfd, "widget_set NXDN Line3 1 2 15 2 h 3 Listening");
+	socketPrintf(m_socketfd, "widget_set NXDN Line2 1 2 15 2 h 3 Listening");
 	socketPrintf(m_socketfd, "widget_set NXDN Line3 1 3 15 3 h 3 \"\"");
 	socketPrintf(m_socketfd, "widget_set NXDN Line4 1 4 15 4 h 3 \"\"");
 	socketPrintf(m_socketfd, "output 16"); // Set LED5 color green
diff --git a/Nextion.cpp b/Nextion.cpp
index 24c9d75..5d95ee9 100644
--- a/Nextion.cpp
+++ b/Nextion.cpp
@@ -211,7 +211,7 @@ void CNextion::writeDStarRSSIInt(unsigned char rssi)
 	m_rssiCount1++;
 
 	if (m_rssiCount1 == DSTAR_RSSI_COUNT) {
-		char text[20U];
+		char text[25U];
 		::sprintf(text, "t3.txt=\"-%udBm\"", m_rssiAccum1 / DSTAR_RSSI_COUNT);
 		sendCommand(text);
 		sendCommandAction(47U);
@@ -226,7 +226,7 @@ void CNextion::writeDStarBERInt(float ber)
 	m_berCount1++;
 
 	if (m_berCount1 == DSTAR_BER_COUNT) {
-		char text[20U];
+		char text[25U];
 		::sprintf(text, "t4.txt=\"%.1f%%\"", m_berAccum1 / float(DSTAR_BER_COUNT));
 		sendCommand(text);
 		sendCommandAction(48U);
@@ -327,7 +327,7 @@ void CNextion::writeDMRRSSIInt(unsigned int slotNo, unsigned char rssi)
 		m_rssiCount1++;
     
 		if (m_rssiCount1 == DMR_RSSI_COUNT) {
-			char text[20U];
+			char text[25U];
 			::sprintf(text, "t4.txt=\"-%udBm\"", m_rssiAccum1 / DMR_RSSI_COUNT);
 			sendCommand(text);
 			sendCommandAction(66U);
@@ -339,7 +339,7 @@ void CNextion::writeDMRRSSIInt(unsigned int slotNo, unsigned char rssi)
 		m_rssiCount2++;
 
 		if (m_rssiCount2 == DMR_RSSI_COUNT) {
-			char text[20U];
+			char text[25U];
 			::sprintf(text, "t5.txt=\"-%udBm\"", m_rssiAccum2 / DMR_RSSI_COUNT);
 			sendCommand(text);
 			sendCommandAction(74U);
@@ -409,7 +409,7 @@ void CNextion::writeDMRBERInt(unsigned int slotNo, float ber)
 		m_berCount1++;
 
 		if (m_berCount1 == DMR_BER_COUNT) {
-			char text[20U];
+			char text[25U];
 			::sprintf(text, "t6.txt=\"%.1f%%\"", m_berAccum1 / DMR_BER_COUNT);
 			sendCommand(text);
 			sendCommandAction(67U);
@@ -421,7 +421,7 @@ void CNextion::writeDMRBERInt(unsigned int slotNo, float ber)
 		m_berCount2++;
 
 		if (m_berCount2 == DMR_BER_COUNT) {
-			char text[20U];
+			char text[25U];
 			::sprintf(text, "t7.txt=\"%.1f%%\"", m_berAccum2 / DMR_BER_COUNT);
 			sendCommand(text);
 			sendCommandAction(75U);
@@ -505,7 +505,7 @@ void CNextion::writeFusionRSSIInt(unsigned char rssi)
 	m_rssiCount1++;
 
 	if (m_rssiCount1 == YSF_RSSI_COUNT) {
-		char text[20U];
+		char text[25U];
 		::sprintf(text, "t3.txt=\"-%udBm\"", m_rssiAccum1 / YSF_RSSI_COUNT);
 		sendCommand(text);
 		sendCommandAction(85U);
@@ -520,7 +520,7 @@ void CNextion::writeFusionBERInt(float ber)
 	m_berCount1++;
 
 	if (m_berCount1 == YSF_BER_COUNT) {
-		char text[20U];
+		char text[25U];
 		::sprintf(text, "t4.txt=\"%.1f%%\"", m_berAccum1 / float(YSF_BER_COUNT));
 		sendCommand(text);
 		sendCommandAction(86U);
@@ -576,7 +576,7 @@ void CNextion::writeP25RSSIInt(unsigned char rssi)
 	m_rssiCount1++;
 
 	if (m_rssiCount1 == P25_RSSI_COUNT) {
-		char text[20U];
+		char text[25U];
 		::sprintf(text, "t2.txt=\"-%udBm\"", m_rssiAccum1 / P25_RSSI_COUNT);
 		sendCommand(text);
 		sendCommandAction(104U);
@@ -591,7 +591,7 @@ void CNextion::writeP25BERInt(float ber)
 	m_berCount1++;
 
 	if (m_berCount1 == P25_BER_COUNT) {
-		char text[20U];
+		char text[25U];
 		::sprintf(text, "t3.txt=\"%.1f%%\"", m_berAccum1 / float(P25_BER_COUNT));
 		sendCommand(text);
 		sendCommandAction(105U);
@@ -646,7 +646,7 @@ void CNextion::writeNXDNRSSIInt(unsigned char rssi)
 	m_rssiCount1++;
 
 	if (m_rssiCount1 == NXDN_RSSI_COUNT) {
-		char text[20U];
+		char text[25U];
 		::sprintf(text, "t2.txt=\"-%udBm\"", m_rssiAccum1 / NXDN_RSSI_COUNT);
 		sendCommand(text);
 		sendCommandAction(104U);
@@ -661,7 +661,7 @@ void CNextion::writeNXDNBERInt(float ber)
 	m_berCount1++;
 
 	if (m_berCount1 == NXDN_BER_COUNT) {
-		char text[20U];
+		char text[25U];
 		::sprintf(text, "t3.txt=\"%.1f%%\"", m_berAccum1 / float(NXDN_BER_COUNT));
 		sendCommand(text);
 		sendCommandAction(105U);