diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 274afd4bca..4e453bfde2 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -1266,7 +1266,6 @@ void Menu::changeVSync() {
 }
 void Menu::changeRenderTargetFramerate(QAction* action) {
     bool vsynOn = Application::getInstance()->isVSyncOn();
-    unsigned int framerate = Application::getInstance()->getRenderTargetFramerate();
 
     QString text = action->text();
     if (text == MenuOption::RenderTargetFramerateUnlimited) {
@@ -1315,7 +1314,7 @@ void Menu::displayNameLocationResponse(const QString& errorString) {
 void Menu::toggleLocationList() {
     if (!_userLocationsDialog) {
         JavascriptObjectMap locationObjectMap;
-        locationObjectMap.insert("InterfaceLocation", LocationScriptingInterface::getInstance());
+        locationObjectMap.insert("InterfaceLocation", &AddressManager::getInstance());
         _userLocationsDialog = DataWebDialog::dialogForPath("/user/locations", locationObjectMap);
     }
     
@@ -1359,7 +1358,7 @@ void Menu::nameLocation() {
     
     if (!_newLocationDialog) {
         JavascriptObjectMap locationObjectMap;
-        locationObjectMap.insert("InterfaceLocation", LocationScriptingInterface::getInstance());
+        locationObjectMap.insert("InterfaceLocation", &AddressManager::getInstance());
         _newLocationDialog = DataWebDialog::dialogForPath("/user/locations/new", locationObjectMap);
     }
     
diff --git a/interface/src/gpu/Batch.cpp b/interface/src/gpu/Batch.cpp
index 054bc09846..b7db58ea30 100644
--- a/interface/src/gpu/Batch.cpp
+++ b/interface/src/gpu/Batch.cpp
@@ -111,6 +111,8 @@ void Batch::runCommand(Command com, uint32 offset) {
         CASE_COMMAND(glColor4f);
         CASE_COMMAND(glMaterialf);
         CASE_COMMAND(glMaterialfv);
+        default:
+            break;
     }
 }
 
diff --git a/interface/src/renderer/Model.cpp b/interface/src/renderer/Model.cpp
index e949e9a811..cdec00aee2 100644
--- a/interface/src/renderer/Model.cpp
+++ b/interface/src/renderer/Model.cpp
@@ -1737,7 +1737,8 @@ int Model::renderMeshes(gpu::Batch& batch, RenderMode mode, bool translucent, fl
                 mesh.texCoords.size() * sizeof(glm::vec2) +
                 (mesh.blendshapes.isEmpty() ? vertexCount * 2 * sizeof(glm::vec3) : 0);
             //skinProgram->setAttributeBuffer(skinLocations->clusterIndices, GL_FLOAT, offset, 4);
-            GLBATCH(glVertexAttribPointer)(skinLocations->clusterIndices, 4, GL_FLOAT, GL_TRUE, 0, (const void*) offset);
+            GLBATCH(glVertexAttribPointer)(skinLocations->clusterIndices, 4, GL_FLOAT, GL_TRUE, 0,
+                                           reinterpret_cast<const void*>(offset));
             //skinProgram->setAttributeBuffer(skinLocations->clusterWeights, GL_FLOAT,
             //    offset + vertexCount * sizeof(glm::vec4), 4);
             GLBATCH(glVertexAttribPointer)(skinLocations->clusterWeights, 4, GL_FLOAT, GL_TRUE, 0, (const void*) (offset + vertexCount * sizeof(glm::vec4)));
diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp
index 1201a8973f..6113cadb06 100644
--- a/libraries/networking/src/AddressManager.cpp
+++ b/libraries/networking/src/AddressManager.cpp
@@ -15,6 +15,7 @@
 #include <qstringlist.h>
 
 #include <GLMHelpers.h>
+#include <UUID.h>
 
 #include "NodeList.h"
 
@@ -71,6 +72,11 @@ const QString AddressManager::currentPath(bool withOrientation) const {
     }
 }
 
+QString AddressManager::getDomainID() const {
+    const QUuid& domainID = NodeList::getInstance()->getDomainHandler().getUUID();
+    return domainID.isNull() ? "" : uuidStringWithoutCurlyBraces(domainID);
+}
+
 const JSONCallbackParameters& AddressManager::apiCallbackParameters() {
     static bool hasSetupParameters = false;
     static JSONCallbackParameters callbackParams;
diff --git a/libraries/networking/src/AddressManager.h b/libraries/networking/src/AddressManager.h
index 8a25464223..d6ecdc9fc6 100644
--- a/libraries/networking/src/AddressManager.h
+++ b/libraries/networking/src/AddressManager.h
@@ -31,6 +31,7 @@ class AddressManager : public QObject {
     Q_PROPERTY(QString protocol READ getProtocol)
     Q_PROPERTY(QString hostname READ getCurrentDomain)
     Q_PROPERTY(QString pathname READ currentPath)
+    Q_PROPERTY(QString domainID READ getDomainID)
 public:
     static AddressManager& getInstance();
     
@@ -41,6 +42,7 @@ public:
     const QString currentPath(bool withOrientation = true) const;
     
     const QString& getCurrentDomain() const { return _currentDomain; }
+    QString getDomainID() const;
     
     void attemptPlaceNameLookup(const QString& lookupString);