diff --git a/examples/example/metavoxels/metavoxels.js b/examples/example/metavoxels/metavoxels.js
deleted file mode 100644
index 32177cdcba..0000000000
--- a/examples/example/metavoxels/metavoxels.js
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-//  metavoxels.js
-//  examples
-//
-//  Copyright 2014 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-Script.setInterval(function() {
-    var spanner;
-    if (Math.random() < 0.5) {
-        spanner = new Sphere();
-    } else {
-        spanner = new Cuboid();
-        spanner.aspectX = 0.1 + Math.random() * 1.9;
-        spanner.aspectY = 0.1 + Math.random() * 1.9;
-    }
-    spanner.scale = 0.1 + Math.random() * 1.9;
-    spanner.rotation = Quat.fromPitchYawRollDegrees(Math.random() * 360.0, Math.random() * 360.0, Math.random() * 360.0);
-    spanner.translation = { x: 10.0 + Math.random() * 10.0, y: 10.0 + Math.random() * 10.0, z: 10.0 + Math.random() * 10.0 };
-    
-    if (Math.random() < 0.5) {
-        var material = new MaterialObject();
-        if (Math.random() < 0.5) {
-            material.diffuse = "http://www.fungibleinsight.com/faces/grass.jpg";
-        } else {
-            material.diffuse = "http://www.fungibleinsight.com/faces/soil.jpg";
-        }
-        Metavoxels.setVoxelMaterial(spanner, material);
-    
-    } else if (Math.random() < 0.5) {
-        Metavoxels.setVoxelColor(spanner, { red: Math.random() * 255.0, green: Math.random() * 255.0,
-            blue: Math.random() * 255.0 });
-    
-    } else {
-        Metavoxels.setVoxelColor(spanner, { red: 0, green: 0, blue: 0, alpha: 0 });
-    }
-}, 1000);
-
diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp
index b528b67745..d4980596dd 100644
--- a/libraries/audio-client/src/AudioClient.cpp
+++ b/libraries/audio-client/src/AudioClient.cpp
@@ -313,7 +313,9 @@ QAudioDeviceInfo defaultAudioDeviceForMode(QAudio::Mode mode) {
 bool adjustedFormatForAudioDevice(const QAudioDeviceInfo& audioDevice,
                                   const QAudioFormat& desiredAudioFormat,
                                   QAudioFormat& adjustedAudioFormat) {
-    if (!audioDevice.isFormatSupported(desiredAudioFormat)) {
+    // FIXME: directly using 24khz has a bug somewhere that causes channels to be swapped.
+    // Continue using our internal resampler, for now.
+    if (true || !audioDevice.isFormatSupported(desiredAudioFormat)) {
         qCDebug(audioclient) << "The desired format for audio I/O is" << desiredAudioFormat;
         qCDebug(audioclient, "The desired audio format is not supported by this device");
 
@@ -321,7 +323,7 @@ bool adjustedFormatForAudioDevice(const QAudioDeviceInfo& audioDevice,
             adjustedAudioFormat = desiredAudioFormat;
             adjustedAudioFormat.setChannelCount(2);
 
-            if (audioDevice.isFormatSupported(adjustedAudioFormat)) {
+            if (false && audioDevice.isFormatSupported(adjustedAudioFormat)) {
                 return true;
             } else {
                 adjustedAudioFormat.setChannelCount(1);
diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index f012ba6eee..cce3045049 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -736,18 +736,11 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
         // is sending us data with a known "last simulated" time. That time is likely in the past, and therefore
         // this "new" data is actually slightly out of date. We calculate the time we need to skip forward and
         // use our simulation helper routine to get a best estimate of where the entity should be.
-        const float MIN_TIME_SKIP = 0.0f;
-        const float MAX_TIME_SKIP = 1.0f; // in seconds
-        float skipTimeForward = glm::clamp((float)(now - lastSimulatedFromBufferAdjusted) / (float)(USECS_PER_SECOND),
-                MIN_TIME_SKIP, MAX_TIME_SKIP);
-        if (skipTimeForward > 0.0f) {
-            #ifdef WANT_DEBUG
-                qCDebug(entities) << "skipTimeForward:" << skipTimeForward;
-            #endif
-            // we want to extrapolate the motion forward to compensate for packet travel time, but
-            // we don't want the side effect of flag setting.
-            simulateKinematicMotion(skipTimeForward, false);
-        }
+        float skipTimeForward = (float)(now - lastSimulatedFromBufferAdjusted) / (float)(USECS_PER_SECOND);
+        
+        // we want to extrapolate the motion forward to compensate for packet travel time, but
+        // we don't want the side effect of flag setting.
+        simulateKinematicMotion(skipTimeForward, false);
     }
 
     if (overwriteLocalData) {
@@ -887,6 +880,15 @@ void EntityItem::simulate(const quint64& now) {
 }
 
 void EntityItem::simulateKinematicMotion(float timeElapsed, bool setFlags) {
+#ifdef WANT_DEBUG
+    qCDebug(entities) << "EntityItem::simulateKinematicMotion timeElapsed" << timeElapsed;
+#endif
+    
+    const float MIN_TIME_SKIP = 0.0f;
+    const float MAX_TIME_SKIP = 1.0f; // in seconds
+    
+    timeElapsed = glm::clamp(timeElapsed, MIN_TIME_SKIP, MAX_TIME_SKIP);
+    
     if (hasActions()) {
         return;
     }