diff --git a/DMRSlot.cpp b/DMRSlot.cpp
index 1f3a918..4c9bb4c 100644
--- a/DMRSlot.cpp
+++ b/DMRSlot.cpp
@@ -234,15 +234,15 @@ void CDMRSlot::writeModem(unsigned char *data)
 
 					writeNetwork(data, DT_CSBK, FLCO_USER_USER, csbk.getSrcId(), csbk.getDstId());
 					writeQueue(data);
+
+					LogMessage("DMR Slot %u, received RF CSBK from %u to %u", m_slotNo, csbk.getSrcId(), csbk.getDstId());
 				}
 				break;
 
 			default:
-				LogWarning("DMR Slot %u, unhandled CSBK type - 0x%02X", m_slotNo, csbko);
+				LogWarning("DMR Slot %u, unhandled RF CSBK type - 0x%02X", m_slotNo, csbko);
 				break;
 			}
-
-			LogMessage("DMR Slot %u, received CSBK", m_slotNo);
 		} else {
 			// Regenerate the Slot Type
 			slotType.getData(data + 2U);
diff --git a/DStarNetwork.cpp b/DStarNetwork.cpp
index 52c13f8..2994797 100644
--- a/DStarNetwork.cpp
+++ b/DStarNetwork.cpp
@@ -29,7 +29,7 @@
 const unsigned int BUFFER_LENGTH = 100U;
 
 CDStarNetwork::CDStarNetwork(const std::string& gatewayAddress, unsigned int gatewayPort, unsigned int localPort, bool debug) :
-m_socket("", localPort),
+m_socket(localPort),
 m_address(),
 m_port(gatewayPort),
 m_debug(debug),
diff --git a/UDPSocket.cpp b/UDPSocket.cpp
index 281f73a..0d50b90 100644
--- a/UDPSocket.cpp
+++ b/UDPSocket.cpp
@@ -43,6 +43,21 @@ m_fd(-1)
 #endif
 }
 
+CUDPSocket::CUDPSocket(unsigned int port) :
+m_address(),
+m_port(port),
+m_fd(-1)
+{
+	assert(port > 0U);
+
+#if defined(_WIN32) || defined(_WIN64)
+	WSAData data;
+	int wsaRet = ::WSAStartup(MAKEWORD(2, 2), &data);
+	if (wsaRet != 0)
+		LogError("Error from WSAStartup");
+#endif
+}
+
 CUDPSocket::CUDPSocket() :
 m_address(),
 m_port(0U),
diff --git a/UDPSocket.h b/UDPSocket.h
index 1d06ee2..7d35544 100644
--- a/UDPSocket.h
+++ b/UDPSocket.h
@@ -37,6 +37,7 @@
 class CUDPSocket {
 public:
 	CUDPSocket(const std::string& address, unsigned int port);
+	CUDPSocket(unsigned int port);
 	CUDPSocket();
 	~CUDPSocket();