diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index bdefbc6773..dbf7b7a418 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1683,6 +1683,9 @@ Application::~Application() {
 
     _physicsEngine->setCharacterController(nullptr);
 
+    // shutdown render engine
+    _main3DScene = nullptr;
+    _renderEngine = nullptr;
     // the _shapeManager should have zero references
     _shapeManager.collectGarbage();
     assert(_shapeManager.getNumShapes() == 0);
@@ -4494,7 +4497,17 @@ void Application::update(float deltaTime) {
 
                 getEntities()->getTree()->withWriteLock([&] {
                     PerformanceTimer perfTimer("handleOutgoingChanges");
+                    const VectorOfMotionStates& deactivations = _physicsEngine->getDeactivatedMotionStates();
+                    _entitySimulation->handleDeactivatedMotionStates(deactivations);
+                getEntities()->getTree()->withWriteLock([&] {
+                    PerformanceTimer perfTimer("handleOutgoingChanges");
 
+
+
+                    const VectorOfMotionStates& outgoingChanges = _physicsEngine->getChangedMotionStates();
+                    _entitySimulation->handleChangedMotionStates(outgoingChanges);
+                    avatarManager->handleChangedMotionStates(outgoingChanges);
+                });
                     const VectorOfMotionStates& outgoingChanges = _physicsEngine->getChangedMotionStates();
                     _entitySimulation->handleChangedMotionStates(outgoingChanges);
                     avatarManager->handleChangedMotionStates(outgoingChanges);
diff --git a/scripts/system/assets/sounds/snap.wav b/scripts/system/assets/sounds/snap.wav
deleted file mode 100644
index e5b86c0c71..0000000000
Binary files a/scripts/system/assets/sounds/snap.wav and /dev/null differ
diff --git a/scripts/system/snapshot.js b/scripts/system/snapshot.js
index 5591766232..e3253f338d 100644
--- a/scripts/system/snapshot.js
+++ b/scripts/system/snapshot.js
@@ -410,7 +410,7 @@ function takeSnapshot() {
         Menu.setIsOptionChecked("Overlays", false);
     }
 
-    var snapActivateSound = SoundCache.getSound(Script.resolvePath("assets/sounds/snap.wav"));
+    var snapActivateSound = SoundCache.getSound(Script.resolvePath("../../resources/sounds/snap.wav"));
 
     // take snapshot (with no notification)
     Script.setTimeout(function () {