diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index fabe8b570c..9bdb7a0792 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -517,9 +517,9 @@ Menu::Menu() {
     addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderOtherLookAtVectors, 0, false);
     addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::FixGaze, 0, false);
     addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::DisplayLeftFootTrace, 0, false,
-        avatar, SLOT(setEnableDebugDrawLeftFootTrace(bool)));
+        avatar.get(), SLOT(setEnableDebugDrawLeftFootTrace(bool)));
     addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::DisplayRightFootTrace, 0, false,
-        avatar, SLOT(setEnableDebugDrawRightFootTrace(bool)));
+        avatar.get(), SLOT(setEnableDebugDrawRightFootTrace(bool)));
     addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::AnimDebugDrawDefaultPose, 0, false,
         avatar.get(), SLOT(setEnableDebugDrawDefaultPose(bool)));
     addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::AnimDebugDrawAnimPose, 0, false,
@@ -553,11 +553,11 @@ Menu::Menu() {
 
     // KINEMATIC_CONTROLLER_HACK
     addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::MoveKinematically, 0, false,
-        avatar, SLOT(updateMotionBehaviorFromMenu()),
+        avatar.get(), SLOT(updateMotionBehaviorFromMenu()),
         UNSPECIFIED_POSITION, "Developer");
 
     addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::EnableVerticalComfortMode, 0, false,
-        avatar, SLOT(setEnableVerticalComfortMode(bool)));
+        avatar.get(), SLOT(setEnableVerticalComfortMode(bool)));
 
     // Developer > Hands >>>
     MenuWrapper* handOptionsMenu = developerMenu->addMenu("Hands");
diff --git a/interface/src/scripting/HMDScriptingInterface.cpp b/interface/src/scripting/HMDScriptingInterface.cpp
index 98dbf3ae07..54f8ed089d 100644
--- a/interface/src/scripting/HMDScriptingInterface.cpp
+++ b/interface/src/scripting/HMDScriptingInterface.cpp
@@ -95,7 +95,7 @@ void HMDScriptingInterface::setPosition(const glm::vec3& position) {
         QMetaObject::invokeMethod(this, "setPosition", Qt::QueuedConnection, Q_ARG(const glm::vec3&, position));
         return;
     } else {
-        MyAvatar* myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
+        auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
         glm::mat4 hmdToSensor = myAvatar->getHMDSensorMatrix();
         glm::mat4 sensorToWorld = myAvatar->getSensorToWorldMatrix();
         glm::mat4 hmdToWorld = sensorToWorld * hmdToSensor;
@@ -156,6 +156,6 @@ void HMDScriptingInterface::centerUI() {
 }
 
 void HMDScriptingInterface::snapToAvatar() {
-    MyAvatar* myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
+    auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
     myAvatar->updateSensorToWorldMatrix();
 }