diff --git a/package.json b/package.json
index 1bf81a77a4b6a01a1d497fedc379a8ab73264873..03ae8e86c0439d1748ed66115b4289d50ab7d7a2 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,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 afc9522ad3c47eb29e6f4ef6b40b09e88505fd54..ee59e3a24ead224a4095c69c70d2ea0da1c9cbd5 100644
--- a/src/elements/a-gltf-entity.js
+++ b/src/elements/a-gltf-entity.js
@@ -93,19 +93,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/yarn.lock b/yarn.lock
index 836568aabfd25733bcb9ed65d34ef7f17f062d28..6ef0aefe1bdce4a08646a63e22a0957c5040c677 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4543,9 +4543,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"