diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp
index 21bbbc82f6..2b9b8d42fb 100644
--- a/libraries/networking/src/AddressManager.cpp
+++ b/libraries/networking/src/AddressManager.cpp
@@ -548,7 +548,13 @@ void AddressManager::setHost(const QString& host, LookupTrigger trigger) {
 
 
 void AddressManager::setDomainInfo(const QString& hostname, quint16 port, LookupTrigger trigger) {
-    setHost(hostname, trigger);
+    
+    QString domainHostString = hostname;
+    if (port != DEFAULT_DOMAIN_SERVER_PORT) {
+        domainHostString.append(QString(":%1").arg(port));
+    }
+    
+    setHost(domainHostString, trigger);
 
     _rootPlaceID = QUuid();
 
diff --git a/libraries/networking/src/udt/PacketHeaders.cpp b/libraries/networking/src/udt/PacketHeaders.cpp
index ccbd56c674..9a39b6f5eb 100644
--- a/libraries/networking/src/udt/PacketHeaders.cpp
+++ b/libraries/networking/src/udt/PacketHeaders.cpp
@@ -135,7 +135,6 @@ QString nameForPacketType(PacketType::Value packetType) {
             PACKET_TYPE_NAME_LOOKUP(DomainConnectionDenied);
             PACKET_TYPE_NAME_LOOKUP(MuteEnvironment);
             PACKET_TYPE_NAME_LOOKUP(AudioStreamStats);
-            PACKET_TYPE_NAME_LOOKUP(DataServerConfirm);
             PACKET_TYPE_NAME_LOOKUP(OctreeStats);
             PACKET_TYPE_NAME_LOOKUP(Jurisdiction);
             PACKET_TYPE_NAME_LOOKUP(JurisdictionRequest);
diff --git a/libraries/networking/src/udt/PacketHeaders.h b/libraries/networking/src/udt/PacketHeaders.h
index a133654b05..5f63a2c840 100644
--- a/libraries/networking/src/udt/PacketHeaders.h
+++ b/libraries/networking/src/udt/PacketHeaders.h
@@ -48,7 +48,7 @@ namespace PacketType {
         DomainConnectionDenied,
         MuteEnvironment,
         AudioStreamStats,
-        DataServerConfirm, // 20
+        UNUSED, // 20
         DomainServerPathQuery,
         DomainServerPathResponse,
         DomainServerAddedNode,