diff --git a/package.json b/package.json
index 0a46231255b2acc1badeb4b600d5097a7d015347..6f9b09fcc7f0318b474b5f44ddece5e4ecb57ebd 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "material-design-lite": "^1.3.0",
     "minijanus": "^0.4.0",
     "naf-janus-adapter": "^0.3.0",
-    "networked-aframe": "https://github.com/netpro2k/networked-aframe#mr-social-client/master",
+    "networked-aframe": "https://github.com/mozillareality/networked-aframe#mr-social-client/master",
     "nipplejs": "^0.6.7",
     "query-string": "^5.0.1",
     "raven-js": "^3.20.1",
diff --git a/src/elements/a-gltf-entity.js b/src/elements/a-gltf-entity.js
index 66ad29803db16a8ca9166e0df149087b22542d42..9dc4ca6e9e178a38bee461d3e7e145dfc4871a59 100644
--- a/src/elements/a-gltf-entity.js
+++ b/src/elements/a-gltf-entity.js
@@ -106,19 +106,16 @@ function attachTemplate(templateEl) {
   const targetEls = templateEl.parentNode.querySelectorAll(selector);
   const clone = document.importNode(templateEl.content, true);
   const templateRoot = clone.firstElementChild;
-  const templateRootAttrs = templateRoot.attributes;
-
-  for (var i = 0; i < targetEls.length; i++) {
-    const targetEl = targetEls[i];
 
+  for (const el of targetEls) {
     // Merge root element attributes with the target element
-    for (var i = 0; i < templateRootAttrs.length; i++) {
-      targetEl.setAttribute(templateRootAttrs[i].name, templateRootAttrs[i].value);
+    for (const { name, value } of templateRoot.attributes) {
+      el.setAttribute(name, value);
     }
 
     // Append all child elements
-    for (var i = 0; i < templateRoot.children.length; i++) {
-      targetEl.appendChild(document.importNode(templateRoot.children[i], true));
+    for (const child of templateRoot.children) {
+      el.appendChild(document.importNode(child, true));
     }
   }
 }
diff --git a/webpack.config.js b/webpack.config.js
index c543bb4b14e0eb971411b0ef754db993baa58b01..8448e44fdd15f209315286bda8a57bcf2b7d9556 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -81,7 +81,8 @@ module.exports = {
   },
   output: {
     path: path.join(__dirname, "public"),
-    filename: "[name]-[chunkhash].js"
+    filename: "[name]-[chunkhash].js",
+    publicPath: process.env.BASE_ASSETS_PATH || ""
   },
   mode: "development",
   devtool: process.env.NODE_ENV === "production" ? "source-map" : "inline-source-map",
diff --git a/yarn.lock b/yarn.lock
index 5d7227d3b072083e62066307e1564c2ef1904f75..c21a28ee4ba2374af1614edbd3519e39dd77ca6c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4440,9 +4440,9 @@ neo-async@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.0.tgz#76b1c823130cca26acfbaccc8fbaf0a2fa33b18f"
 
-"networked-aframe@https://github.com/netpro2k/networked-aframe#mr-social-client/master":
+"networked-aframe@https://github.com/mozillareality/networked-aframe#mr-social-client/master":
   version "0.5.1"
-  resolved "https://github.com/netpro2k/networked-aframe#f7a00ff58e943923bbbea0414ff4fa94e53ad4a4"
+  resolved "https://github.com/mozillareality/networked-aframe#71eac3b7fff0c41be5021efa6cc7b5329536b1e4"
   dependencies:
     aframe-lerp-component "^1.1.0"
     easyrtc "1.1.0"