diff --git a/domain-server/src/DomainServer.h b/domain-server/src/DomainServer.h
index 23e1299374..5d2ac762ac 100644
--- a/domain-server/src/DomainServer.h
+++ b/domain-server/src/DomainServer.h
@@ -28,8 +28,10 @@
 #include <HTTPSConnection.h>
 #include <LimitedNodeList.h>
 #include <shared/WebRTC.h>
+#if defined(WEBRTC_DATA_CHANNEL)
 #include <webrtc/WebRTCDataChannels.h>
 #include <webrtc/WebRTCSignalingServer.h>
+#endif
 
 #include "AssetsBackupHandler.h"
 #include "DomainGatekeeper.h"
diff --git a/libraries/networking/src/DomainHandler.h b/libraries/networking/src/DomainHandler.h
index a8c316572a..05cf8f26d5 100644
--- a/libraries/networking/src/DomainHandler.h
+++ b/libraries/networking/src/DomainHandler.h
@@ -44,9 +44,9 @@ const unsigned short DEFAULT_DOMAIN_SERVER_PORT =
 
 const unsigned short DEFAULT_DOMAIN_SERVER_WS_PORT =
     QProcessEnvironment::systemEnvironment()
-    .contains("HIFI_DOMAIN_SERVER_WS_PORT")
+    .contains("VIRCADIA_DOMAIN_SERVER_WS_PORT")
         ? QProcessEnvironment::systemEnvironment()
-            .value("HIFI_DOMAIN_SERVER_WS_PORT")
+            .value("VIRCADIA_DOMAIN_SERVER_WS_PORT")
             .toUShort()
         : 40102;  // TCP
 
diff --git a/vircadia-web b/vircadia-web
index d2e383cab8..ac1f13a39c 160000
--- a/vircadia-web
+++ b/vircadia-web
@@ -1 +1 @@
-Subproject commit d2e383cab811018422433fe0d8f224e53e0506cf
+Subproject commit ac1f13a39c702ee54bf2cda8bc35e5d34f7f0756