diff --git a/interface/src/devices/DdeFaceTracker.cpp b/interface/src/devices/DdeFaceTracker.cpp
index 6ed253c1ec..14728f021b 100644
--- a/interface/src/devices/DdeFaceTracker.cpp
+++ b/interface/src/devices/DdeFaceTracker.cpp
@@ -183,8 +183,8 @@ DdeFaceTracker::DdeFaceTracker(const QHostAddress& host, quint16 serverPort, qui
     _filteredEyeBlinks(),
     _lastEyeCoefficients(),
     _isCalibrating(false),
-    _calibrationValues(),
     _calibrationCount(0),
+    _calibrationValues(),
     _calibrationBillboard(NULL),
     _calibrationBillboardID(0),
     _calibrationMessage(QString())
diff --git a/libraries/entities/src/SimpleEntitySimulation.cpp b/libraries/entities/src/SimpleEntitySimulation.cpp
index 518d10d056..18d5c4ecb0 100644
--- a/libraries/entities/src/SimpleEntitySimulation.cpp
+++ b/libraries/entities/src/SimpleEntitySimulation.cpp
@@ -54,8 +54,6 @@ void SimpleEntitySimulation::removeEntityInternal(EntityItem* entity) {
     _hasSimulationOwnerEntities.remove(entity);
 }
 
-const int SIMPLE_SIMULATION_DIRTY_FLAGS = EntityItem::DIRTY_VELOCITIES | EntityItem::DIRTY_MOTION_TYPE;
-
 void SimpleEntitySimulation::changeEntityInternal(EntityItem* entity) {
     EntitySimulation::changeEntityInternal(entity);
     if (!entity->getSimulatorID().isNull()) {
diff --git a/libraries/model/src/model/Stage.cpp b/libraries/model/src/model/Stage.cpp
index e5d23e9191..a255a1f7c9 100644
--- a/libraries/model/src/model/Stage.cpp
+++ b/libraries/model/src/model/Stage.cpp
@@ -12,6 +12,7 @@
 
 #include <glm/gtx/transform.hpp> 
 #include <math.h>
+#include <qcompilerdetection.h>
 
 #include "SkyFromAtmosphere_vert.h"
 #include "SkyFromAtmosphere_frag.h"
@@ -292,17 +293,19 @@ void SunSkyStage::updateGraphicsObject() const {
     }
 
     // Background
-    switch (getBackgroundMode()) {
-    case NO_BACKGROUND: {
-        break;
-    }
-    case SKY_DOME: {
-        break;
-    }
-    case SKY_BOX: {
-        break;
-    }
-    };
+    switch (getBackgroundMode()) {
+        case NO_BACKGROUND: {
+            break;
+        }
+        case SKY_DOME: {
+            break;
+        }
+        case SKY_BOX: {
+            break;
+        }
+        case NUM_BACKGROUND_MODES:
+            Q_UNREACHABLE();
+    };
 
     static int firstTime = 0;
     if (firstTime == 0) {
diff --git a/libraries/model/src/model/TextureStorage.h b/libraries/model/src/model/TextureStorage.h
index 2b19a6cc1d..ebc027298b 100755
--- a/libraries/model/src/model/TextureStorage.h
+++ b/libraries/model/src/model/TextureStorage.h
@@ -38,9 +38,10 @@ public:
     ~TextureStorage();
 
     const QUrl& getUrl() const { return _url; }
-    const gpu::Texture::Type getType() const { return _usage._type; }
+    gpu::Texture::Type getType() const { return _usage._type; }
     const gpu::TexturePointer& getGPUTexture() const { return _gpuTexture; }
-
+    
+    virtual void reset() { Storage::reset(); }
     void reset(const QUrl& url, const TextureUsage& usage);
 
 protected:
diff --git a/libraries/render-utils/src/GlowEffect.cpp b/libraries/render-utils/src/GlowEffect.cpp
index bb18729f12..cb69421b82 100644
--- a/libraries/render-utils/src/GlowEffect.cpp
+++ b/libraries/render-utils/src/GlowEffect.cpp
@@ -117,18 +117,6 @@ void GlowEffect::end() {
     glBlendColor(0.0f, 0.0f, 0.0f, _intensity = _intensityStack.pop());
 }
 
-static void maybeBind(const gpu::FramebufferPointer& fbo) {
-    if (fbo) {
-        glBindFramebuffer(GL_FRAMEBUFFER, gpu::GLBackend::getFramebufferID(fbo));
-    }
-}
-
-static void maybeRelease(const gpu::FramebufferPointer& fbo) {
-    if (fbo) {
-        glBindFramebuffer(GL_FRAMEBUFFER, 0);
-    }
-}
-
 gpu::FramebufferPointer GlowEffect::render() {
     PerformanceTimer perfTimer("glowEffect");