diff --git a/OBSApi/GraphicsSystem.cpp b/OBSApi/GraphicsSystem.cpp
index c2e35f4f..6064c0b3 100644
--- a/OBSApi/GraphicsSystem.cpp
+++ b/OBSApi/GraphicsSystem.cpp
@@ -68,7 +68,7 @@ struct FutureShaderContainer
         unique_ptr<void, HandleCloser> thread;
         wstring fileName;
     };
-    map<wstring, unique_ptr<FutureShaderContext>> contexts;
+    map<wstring, FutureShaderContext> contexts;
     unique_ptr<void, MutexCloser> lock;
     FutureShaderContainer() : lock(OSCreateMutex()) {}
 };
@@ -136,9 +136,8 @@ FutureShader GraphicsSystem::CreatePixelShaderFromFileAsync(CTSTR fileName)
     MutexLock m(futureShaders->lock);
 
     bool initialized = cs.find(fn) != end(cs);
-    if (!initialized)
-        cs[fn].reset(new FutureShaderContainer::FutureShaderContext);
-    auto &c = *cs[fn];
+
+    auto &c = cs[fn];
 
     if (!initialized)
     {
diff --git a/QSVHelper/QSVHelper.cpp b/QSVHelper/QSVHelper.cpp
index ee48ab74..f40ddac3 100644
--- a/QSVHelper/QSVHelper.cpp
+++ b/QSVHelper/QSVHelper.cpp
@@ -145,12 +145,12 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR pCmdLine,
     if(!init_res->using_custom_impl || !encoder)
     {
         init_res->using_custom_impl = false;
-        decltype(begin(valid_impl)) best = nullptr;
-        for(auto impl = begin(valid_impl); impl != std::end(valid_impl); impl++)
+        decltype(&valid_impl[0]) best = nullptr;
+        for(auto &impl : valid_impl)
         {
-            auto result = encoder.InitializeMFX(*impl);
+            auto result = encoder.InitializeMFX(impl);
             if(result == MFX_WRN_PARTIAL_ACCELERATION && !best)
-                best = impl;
+                best = &impl;
             if(result == MFX_ERR_NONE)
                 break;
         }
diff --git a/Source/SettingsPublish.cpp b/Source/SettingsPublish.cpp
index 63239741..b20ca0c9 100644
--- a/Source/SettingsPublish.cpp
+++ b/Source/SettingsPublish.cpp
@@ -523,8 +523,8 @@ void SettingsPublish::OptimizeSettings()
     if (OBSMessageBox(hwnd, changes.Array(), nullptr, MB_OKCANCEL) != IDOK)
         return;
 
-    for (optimizers_t::iterator i = begin(optimizers); i != end(optimizers); i++)
-        (*i)();
+    for (optimizers_t::const_reference i : optimizers)
+        i();
 }
 
 INT_PTR SettingsPublish::ProcMessage(UINT message, WPARAM wParam, LPARAM lParam)