diff --git a/package.json b/package.json
index e2d2ddfb578851bba9e296dbde1b41c21afd143b..f237ac272e02ade35a8f1aa243c70a1216626f8c 100644
--- a/package.json
+++ b/package.json
@@ -10,10 +10,10 @@
     "prettier": "prettier --write src/**/*.js"
   },
   "dependencies": {
-    "aframe": "https://github.com/aframevr/aframe#ba2a2875ef7662a3bf4aec86f82d4f972684216a",
+    "aframe": "https://github.com/aframevr/aframe",
     "aframe-extras": "^3.12.4",
     "aframe-input-mapping-component": "https://github.com/johnshaughnessy/aframe-input-mapping-component#23e2855",
-    "aframe-physics-extras": "^0.1.2",
+    "aframe-physics-extras": "https://github.com/infinitelee/aframe-physics-extras#fix/physics-collider-crash",
     "aframe-physics-system": "https://github.com/infinitelee/aframe-physics-system#fix/3.0.0_fixes",
     "aframe-teleport-controls": "https://github.com/netpro2k/aframe-teleport-controls#feature/teleport-origin",
     "extract-text-webpack-plugin": "^3.0.2",
diff --git a/src/components/cursor-hand.js b/src/components/cursor-hand.js
index 84a6a5fc47f1bb6b78976a2c7756e233c13c52d0..89e4eb48dbbe87a70d30191e9e82e7d91d854658 100644
--- a/src/components/cursor-hand.js
+++ b/src/components/cursor-hand.js
@@ -14,11 +14,11 @@ AFRAME.registerComponent("cursor-hand", {
     this.enabled = true;
 
     document.addEventListener("mousedown", (e) => {
-      this.data.cursor.emit("action_grab");
+      this.data.cursor.emit("action_grab", {});
     });
 
     document.addEventListener("mouseup", (e) => {
-      this.data.cursor.emit("action_release");
+      this.data.cursor.emit("action_release", {});
     });
 
     document.addEventListener("wheel", (e) => {
diff --git a/templates/room.hbs b/templates/room.hbs
index 5383036521d2c171b6714babb7129c20dbacbbb4..094a9e87971302df529dcaa8161cba4a20ddf1c5 100644
--- a/templates/room.hbs
+++ b/templates/room.hbs
@@ -168,8 +168,9 @@
             <a-entity
                 id="head"
                 camera
+                position="0 1.6 0"
                 personal-space-bubble
-                look-controls
+                look-controls="pointerLockEnabled: true;"
                 networked="template: #head-template; showLocalTemplate: false;"
             >
             <a-entity