diff --git a/indra/newview/llmaterialmgr.h b/indra/newview/llmaterialmgr.h
index f0fad3857513ade3c9ba0fd5f8fffa00cf4aecbc..495de2a3e0443f7effc6c3d1cc266ba1f1df9389 100644
--- a/indra/newview/llmaterialmgr.h
+++ b/indra/newview/llmaterialmgr.h
@@ -121,7 +121,6 @@ class LLMaterialMgr final : public LLSingleton<LLMaterialMgr>
 
 
 	get_queue_t				mGetQueue;
-    uuid_set_t              mRegionGets;
 	get_pending_map_t		mGetPending;
 	get_callback_map_t		mGetCallbacks;
 
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index 02549235fb082dca932015ac3e37453e3722d22f..fc92434cbc5b1f3f3669bbd85f64c984d1efaada 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -1253,7 +1253,7 @@ void LLViewerObjectList::fetchPhisicsFlagsCoro(std::string url)
     LLSD idList;
     U32 objectIndex = 0;
 
-    for (uuid_set_t::iterator it = mStalePhysicsFlags.begin(); it != mStalePhysicsFlags.end();)
+    for (auto it = mStalePhysicsFlags.begin(); it != mStalePhysicsFlags.end();)
     {
         // Check to see if a request for this object
         // has already been made.
@@ -1263,7 +1263,7 @@ void LLViewerObjectList::fetchPhisicsFlagsCoro(std::string url)
             idList[objectIndex++] = *it;
         }
 
-        mStalePhysicsFlags.erase(it++);
+        it = mStalePhysicsFlags.erase(it);
 
         if (objectIndex >= MAX_CONCURRENT_PHYSICS_REQUESTS)
         {
diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h
index 31f154141df43b1104a8cebe89158216fd277584..0e23b54c20965a85468fe306c2c5d5752efb1101 100644
--- a/indra/newview/llviewerobjectlist.h
+++ b/indra/newview/llviewerobjectlist.h
@@ -214,17 +214,19 @@ class LLViewerObjectList
 
 	vobj_list_t mMapObjects;
 
-    uuid_set_t   mDeadObjects;
+
+	using uuid_hash_set_t = boost::unordered_set<LLUUID>;
+    uuid_hash_set_t   mDeadObjects;
 
 	boost::unordered_flat_map<LLUUID, LLPointer<LLViewerObject> > mUUIDObjectMap;
 
 	//set of objects that need to update their cost
-    uuid_set_t   mStaleObjectCost;
-    uuid_set_t   mPendingObjectCost;
+    uuid_hash_set_t   mStaleObjectCost;
+    uuid_hash_set_t   mPendingObjectCost;
 
 	//set of objects that need to update their physics flags
-    uuid_set_t   mStalePhysicsFlags;
-    uuid_set_t   mPendingPhysicsFlags;
+    uuid_hash_set_t   mStalePhysicsFlags;
+    uuid_hash_set_t   mPendingPhysicsFlags;
 
 	std::vector<LLDebugBeacon> mDebugBeacons;