diff --git a/UDPSocket.cpp b/UDPSocket.cpp
index fb621f0..7295ee9 100644
--- a/UDPSocket.cpp
+++ b/UDPSocket.cpp
@@ -90,12 +90,12 @@ bool CUDPSocket::open()	// returns true on error
 
 		int reuse = 1;
 		if (::setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (char *)&reuse, sizeof(reuse)) == -1) {
-			printf("Cannot set the UDP socket option, err: %d, %s\n", errno, strerror(errno));
+			printf("Cannot set the UDP socket (port %u) option, err: %d, %s\n", m_port, errno, strerror(errno));
 			return true;
 		}
 
 		if (::bind(m_fd, (sockaddr*)&addr, sizeof(sockaddr_in)) == -1) {
-			printf("Cannot bind the UDP address, err: %d, %s\n", errno, strerror(errno));
+			printf("Cannot bind the UDP (port %u) address, err: %d, %s\n", m_port, errno, strerror(errno));
 			return true;
 		}
 	}
diff --git a/g2_ircddb.cpp b/g2_ircddb.cpp
index 9f5f715..0b63f6e 100644
--- a/g2_ircddb.cpp
+++ b/g2_ircddb.cpp
@@ -57,7 +57,6 @@
 #include "IRCutils.h"
 #include "versions.h"
 #include "g2_typedefs.h"
-#include "aprs.h"
 #include "g2_ircddb.h"
 
 
diff --git a/g2_ircddb.h b/g2_ircddb.h
index 7f4a5a6..5acab17 100644
--- a/g2_ircddb.h
+++ b/g2_ircddb.h
@@ -18,6 +18,8 @@
 
 #include <libconfig.h++>
 
+#include "aprs.h"
+
 using namespace libconfig;
 
 #define IP_SIZE 15
diff --git a/mmdvm_modem.cpp b/mmdvm_modem.cpp
index 5790796..b24f199 100644
--- a/mmdvm_modem.cpp
+++ b/mmdvm_modem.cpp
@@ -70,13 +70,13 @@ void CMMDVMModem::Run(const char *cfgfile)
 	if (Initialize(cfgfile))
 		return;
 
-	CUDPSocket GatewaySock(G2_INTERNAL_IP, G2_INTERNAL_PORT);
-	if (GatewaySock.open())
+	CUDPSocket MMDVMSock(MMDVM_IP, MMDVM_PORT);
+	if (MMDVMSock.open())
 		return;
 
-	CUDPSocket MMDVMSock(MMDVM_IP, MMDVM_PORT);
-	if (MMDVMSock.open()) {
-		GatewaySock.close();
+	CUDPSocket GatewaySock(G2_INTERNAL_IP, G2_INTERNAL_PORT);
+	if (GatewaySock.open()) {
+		MMDVMSock.close();
 		return;
 	}