diff --git a/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp
index 7e95727fcc..d8b8cbd54a 100644
--- a/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp
@@ -165,11 +165,11 @@ static const uint32_t MIN_THROTTLE_CHECK_FRAMES = 60;
 bool Basic2DWindowOpenGLDisplayPlugin::isThrottled() const {
     static auto lastCheck = presentCount();
     // Don't access the menu API every single frame
-   // if ((presentCount() - lastCheck) > MIN_THROTTLE_CHECK_FRAMES) {
+    if ((presentCount() - lastCheck) > MIN_THROTTLE_CHECK_FRAMES) {
         static const QString ThrottleFPSIfNotFocus = "Throttle FPS If Not Focus"; // FIXME - this value duplicated in Menu.h
         _isThrottled  = (!_container->isForeground() && _container->isOptionChecked(ThrottleFPSIfNotFocus));
-  //      lastCheck = presentCount();
- //   }
+        lastCheck = presentCount();
+    }
 
     return _isThrottled;
 }
diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
index 362952ddd7..190d4d4104 100644
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
@@ -172,16 +172,7 @@ public:
             // If there's no active plugin, just sleep
             if (currentPlugin == nullptr) {
                 // Minimum sleep ends up being about 2 ms anyway
-                QThread::msleep(16);
-                continue;
-            }
-
-            static uint _vsyncLoopIndex = 0;
-            _vsyncLoopIndex++;
-
-            if (currentPlugin->isThrottled() && (_vsyncLoopIndex % 8)) {
-                // Minimum sleep ends up being about 2 ms anyway
-                QThread::msleep(16);
+                QThread::msleep(1);
                 continue;
             }
 
diff --git a/libraries/gpu/src/gpu/Buffer.cpp b/libraries/gpu/src/gpu/Buffer.cpp
index b3716c3490..ebb768e597 100644
--- a/libraries/gpu/src/gpu/Buffer.cpp
+++ b/libraries/gpu/src/gpu/Buffer.cpp
@@ -163,24 +163,6 @@ Buffer::Size Buffer::getSize() const {
 
 const Element BufferView::DEFAULT_ELEMENT = Element( gpu::SCALAR, gpu::UINT8, gpu::RAW );
 
-BufferView::BufferView(const BufferView& view) :
-    _buffer(view._buffer),
-    _offset(view._offset),
-    _size(view._size),
-    _element(view._element),
-    _stride(view._stride)
-{}
-
-BufferView& BufferView::operator=(const BufferView& view) {
-    _buffer = (view._buffer);
-    _offset = (view._offset);
-    _size = (view._size);
-    _element = (view._element);
-    _stride = (view._stride);
-
-    return (*this);
-}
-
 BufferView::BufferView() :
 BufferView(DEFAULT_ELEMENT) {}
 
diff --git a/libraries/gpu/src/gpu/Buffer.h b/libraries/gpu/src/gpu/Buffer.h
index e486e2392a..01cc652fd1 100644
--- a/libraries/gpu/src/gpu/Buffer.h
+++ b/libraries/gpu/src/gpu/Buffer.h
@@ -183,8 +183,8 @@ public:
     Element _element { DEFAULT_ELEMENT };
     uint16 _stride { 0 };
 
-    BufferView(const BufferView& view);
-    BufferView& operator=(const BufferView& view);
+    BufferView(const BufferView& view) = default;
+    BufferView& operator=(const BufferView& view) = default;
 
     BufferView();
     BufferView(const Element& element);