diff --git a/src/ObjCompiling/Game/T6/KeyValuePairs/KeyValuePairsCompilerT6.cpp b/src/ObjCompiling/Game/T6/KeyValuePairs/KeyValuePairsCompilerT6.cpp
index 92be6c06..35724a68 100644
--- a/src/ObjCompiling/Game/T6/KeyValuePairs/KeyValuePairsCompilerT6.cpp
+++ b/src/ObjCompiling/Game/T6/KeyValuePairs/KeyValuePairsCompilerT6.cpp
@@ -18,7 +18,7 @@ namespace
             : m_memory(memory),
               m_zone(zone),
               m_zone_definition(zoneDefinition),
-              m_kvp_creator(zoneStates.GetZoneAssetCreationState<::key_value_pairs::Creator>())
+              m_kvp_creator(zoneStates.GetZoneAssetCreationState<key_value_pairs::Creator>())
         {
         }
 
@@ -67,7 +67,7 @@ namespace
         MemoryManager& m_memory;
         const Zone& m_zone;
         const ZoneDefinition& m_zone_definition;
-        ::key_value_pairs::Creator m_kvp_creator;
+        key_value_pairs::Creator& m_kvp_creator;
     };
 } // namespace
 
diff --git a/src/ObjLoading/Asset/IZoneAssetCreationState.h b/src/ObjLoading/Asset/IZoneAssetCreationState.h
index c63b1861..5692f553 100644
--- a/src/ObjLoading/Asset/IZoneAssetCreationState.h
+++ b/src/ObjLoading/Asset/IZoneAssetCreationState.h
@@ -52,14 +52,15 @@ public:
         static_assert(std::is_base_of_v<IZoneAssetCreationState, T>, "T must inherit IZoneAssetCreationState");
         // T must also have a public default constructor
 
-        const auto foundEntry = m_zone_asset_creation_states.find(typeid(T));
+        std::type_index typeId = typeid(T);
+        const auto foundEntry = m_zone_asset_creation_states.find(typeId);
         if (foundEntry != m_zone_asset_creation_states.end())
             return *dynamic_cast<T*>(foundEntry->second.get());
 
         auto newState = std::make_unique<T>();
         newState->Inject(m_injection);
         auto* newStatePtr = newState.get();
-        m_zone_asset_creation_states.emplace(std::make_pair<std::type_index, std::unique_ptr<IZoneAssetCreationState>>(typeid(T), std::move(newState)));
+        m_zone_asset_creation_states.emplace(std::move(typeId), std::move(newState));
 
         return *newStatePtr;
     }
diff --git a/test/ObjCompilingTests/Game/T6/KeyValuePairs/KeyValuePairsCompilerT6Test.cpp b/test/ObjCompilingTests/Game/T6/KeyValuePairs/KeyValuePairsCompilerT6Test.cpp
index c80dece3..3a94a2df 100644
--- a/test/ObjCompilingTests/Game/T6/KeyValuePairs/KeyValuePairsCompilerT6Test.cpp
+++ b/test/ObjCompilingTests/Game/T6/KeyValuePairs/KeyValuePairsCompilerT6Test.cpp
@@ -43,7 +43,7 @@ namespace
         IgnoredAssetLookup m_ignored_assets;
         AssetCreationContext m_context;
 
-        ::key_value_pairs::Creator& m_kvp_creator;
+        key_value_pairs::Creator& m_kvp_creator;
     };
 } // namespace
 
@@ -81,7 +81,7 @@ namespace test::game::t6::keyvaluepairs
         TestContext testContext;
         const auto sut = testContext.CreateSut();
 
-        testContext.m_kvp_creator.AddKeyValuePair(::key_value_pairs::CommonKeyValuePair("ipak_read", "test_ipak"));
+        testContext.m_kvp_creator.AddKeyValuePair(key_value_pairs::CommonKeyValuePair("ipak_read", "test_ipak"));
 
         sut->FinalizeZone(testContext.m_context);
 
@@ -107,7 +107,7 @@ namespace test::game::t6::keyvaluepairs
         TestContext testContext;
         const auto sut = testContext.CreateSut();
 
-        testContext.m_kvp_creator.AddKeyValuePair(::key_value_pairs::CommonKeyValuePair(0xDDEEFFAA, "hello_there"));
+        testContext.m_kvp_creator.AddKeyValuePair(key_value_pairs::CommonKeyValuePair(0xDDEEFFAA, "hello_there"));
 
         sut->FinalizeZone(testContext.m_context);