diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp
index d9cf479b17..86883d94e5 100644
--- a/assignment-client/src/Agent.cpp
+++ b/assignment-client/src/Agent.cpp
@@ -186,7 +186,8 @@ void Agent::run() {
                 qDebug() << "Uncaught exception at line" << line << ":" << engine.uncaughtException().toString() << "\n";
             }
 
-            while (NodeList::getInstance()->getNodeSocket()->receive((sockaddr*) &senderAddress, receivedData, &receivedBytes)) {
+            while (NodeList::getInstance()->getNodeSocket()->receive((sockaddr*) &senderAddress, receivedData, &receivedBytes)
+                   && packetVersionMatch(receivedData)) {
                 if (!firstDomainCheckIn && receivedData[0] == PACKET_TYPE_DOMAIN) {
                     firstDomainCheckIn = true;
                 }
diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index 2e54988eec..30c59fa6f1 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -399,9 +399,8 @@ void AudioMixer::run() {
                 
                 // give the new audio data to the matching injector node
                 nodeList->updateNodeWithData(matchingInjector, packetData, receivedBytes);
-            } else if (packetData[0] == PACKET_TYPE_PING || packetData[0] == PACKET_TYPE_DOMAIN) {
-                
-                // If the packet is a ping, let processNodeData handle it.
+            } else {
+                // let processNodeData handle it.
                 nodeList->processNodeData(nodeAddress, packetData, receivedBytes);
             }
         }
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 9e375e7d87..889e99a748 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -614,7 +614,7 @@ int DomainServer::run() {
                         int numHeaderBytes = populateTypeAndVersion(broadcastPacket, PACKET_TYPE_CREATE_ASSIGNMENT);
                         int numAssignmentBytes = assignmentToDeploy->packToBuffer(broadcastPacket + numHeaderBytes);
         
-                        nodeList->getNodeSocket()->send((sockaddr*) &nodePublicAddress,
+                        nodeList->getNodeSocket()->send((sockaddr*) &senderAddress,
                                                         broadcastPacket,
                                                         numHeaderBytes + numAssignmentBytes);
                     }
diff --git a/libraries/voxel-server-library/src/VoxelServer.cpp b/libraries/voxel-server-library/src/VoxelServer.cpp
index f02069af2e..91c8f5b71a 100644
--- a/libraries/voxel-server-library/src/VoxelServer.cpp
+++ b/libraries/voxel-server-library/src/VoxelServer.cpp
@@ -398,8 +398,10 @@ void VoxelServer::run() {
                     nodeData->initializeVoxelSendThread(this);
                 }
                 
-            } else if (packetData[0] == PACKET_TYPE_PING) {
-                // If the packet is a ping, let processNodeData handle it.
+            } else if (packetData[0] == PACKET_TYPE_PING
+                       || packetData[0] == PACKET_TYPE_DOMAIN
+                       || packetData[0] == PACKET_TYPE_STUN_RESPONSE) {
+                // let processNodeData handle it.
                 NodeList::getInstance()->processNodeData(&senderAddress, packetData, packetLength);
             } else if (packetData[0] == PACKET_TYPE_DOMAIN) {
                 NodeList::getInstance()->processNodeData(&senderAddress, packetData, packetLength);