diff --git a/interface/src/workload/GameWorkload.cpp b/interface/src/workload/GameWorkload.cpp
index 1f07d2e734..68e3998210 100644
--- a/interface/src/workload/GameWorkload.cpp
+++ b/interface/src/workload/GameWorkload.cpp
@@ -14,7 +14,6 @@
 #include <workload/SpaceClassifier.h>
 
 #include "PhysicsBoundary.h"
-#pragma optimize( "[optimization-list]", off )
 
 ControlViews::ControlViews() {
     regionBackFronts[0] = glm::vec2(1.0f, 3.0f);
@@ -53,7 +52,7 @@ glm::vec2 Regulator::run(const Timing_ns& regulationDuration, const Timing_ns& m
     // Regulate next value based on current moving toward the goal budget
     float error_ms = std::chrono::duration<float, std::milli>(_budget - measured).count();
     float coef = error_ms / std::chrono::duration<float, std::milli>(regulationDuration).count();
-    next += coef * (error_ms < 0.0 ? _speedDown : _speedUp);
+    next += coef * (error_ms < 0.0f ? _speedDown : _speedUp);
 
     // Clamp to min max
     next = glm::clamp(next, _minRange, _maxRange);
@@ -78,7 +77,6 @@ void ControlViews::regulateViews(workload::Views& outViews, const workload::Timi
     _dataExport.timings[workload::Region::R2] = _dataExport.timings[workload::Region::R1];
     _dataExport.timings[workload::Region::R3] = std::chrono::duration<float, std::milli>(timings[1]).count();
 
-    int i = 0;
     for (auto& outView : outViews) {
         outView.regionBackFronts[workload::Region::R1] = regionBackFronts[workload::Region::R1];
         outView.regionBackFronts[workload::Region::R2] = regionBackFronts[workload::Region::R2];
@@ -88,8 +86,6 @@ void ControlViews::regulateViews(workload::Views& outViews, const workload::Timi
     }
 }
 
-#pragma optimize( "[optimization-list]", on )
-
 class WorkloadEngineBuilder {
 public:
 public:
diff --git a/libraries/task/src/task/Task.h b/libraries/task/src/task/Task.h
index b528802947..6979815cd2 100644
--- a/libraries/task/src/task/Task.h
+++ b/libraries/task/src/task/Task.h
@@ -399,11 +399,15 @@ public:
 
     void run() {
         if (_context) {
-            TaskType::run(_context);
+            run(_context);
         }
     }
 
 protected:
+    void run(const ContextPointer& jobContext) override {
+        TaskType::run(_context);
+    }
+    
     ContextPointer _context;
 };
 }