diff --git a/src/net/common/connectdata.cpp b/src/net/common/connectdata.cpp
index f6a50240..f0872a2d 100644
--- a/src/net/common/connectdata.cpp
+++ b/src/net/common/connectdata.cpp
@@ -18,10 +18,14 @@
  ***************************************************************************/
 
 #include <net/connectdata.h>
+#include <memory>
+
+using namespace std;
 
 ConnectData::ConnectData()
 : m_sockfd(INVALID_SOCKET), m_peerAddrSize(sizeof(m_peerAddr))
 {
+	memset(&m_peerAddr, 0, sizeof(m_peerAddr));
 }
 
 ConnectData::~ConnectData()
diff --git a/src/net/common/serveracceptthread.cpp b/src/net/common/serveracceptthread.cpp
index 2fd8484e..5e798eb8 100644
--- a/src/net/common/serveracceptthread.cpp
+++ b/src/net/common/serveracceptthread.cpp
@@ -202,7 +202,6 @@ ServerAcceptThread::AcceptLoop()
 		{
 			// Set the size of the peer address.
 			tmpData->SetPeerAddrSize(addrLen);
-			tmpData->GetPeerAddr()->sa_family = context.GetAddrFamily();
 
 			// Optional calls - don't check return value.
 			// Enable keepalive - won't be of much use but better than nothing.