diff --git a/libraries/workload/src/workload/Space.cpp b/libraries/workload/src/workload/Space.cpp
index 40491fa21e..ada5e49ebb 100644
--- a/libraries/workload/src/workload/Space.cpp
+++ b/libraries/workload/src/workload/Space.cpp
@@ -43,14 +43,14 @@ void Space::processTransactionFrame(const Transaction& transaction) {
 void Space::processResets(const Transaction::Resets& transactions) {
     for (auto& reset : transactions) {
         // Access the true item
-        auto ProxyID = std::get<0>(reset);
-        auto& item = _proxies[ProxyID];
+        auto proxyID = std::get<0>(reset);
+        auto& item = _proxies[proxyID];
 
         // Reset the item with a new payload
         item.sphere = (std::get<1>(reset));
         item.prevRegion = item.region = Region::UNKNOWN;
 
-        _owners[ProxyID] = (std::get<2>(reset));
+        _owners[proxyID] = (std::get<2>(reset));
     }
 }
 
@@ -84,9 +84,9 @@ void Space::processUpdates(const Transaction::Updates& transactions) {
 
 void Space::categorizeAndGetChanges(std::vector<Space::Change>& changes) {
     std::unique_lock<std::mutex> lock(_proxiesMutex);
-    uint32_t numProxies = (uint32_t)_proxies.size();
+    uint32_t maxID = (uint32_t)(_IDAllocator.getNumAllocatedIndices());
     uint32_t numViews = (uint32_t)_views.size();
-    for (uint32_t i = 0; i < numProxies; ++i) {
+    for (uint32_t i = 0; i < maxID; ++i) {
         Proxy& proxy = _proxies[i];
         if (proxy.region < Region::INVALID) {
             glm::vec3 proxyCenter = glm::vec3(proxy.sphere);