diff --git a/editor/Project.cpp b/editor/Project.cpp
index d23f23f..d76e755 100644
--- a/editor/Project.cpp
+++ b/editor/Project.cpp
@@ -102,10 +102,12 @@ Project::Project()
 GE::Game::Descriptor Project::makeGameDescriptor() const
 {
     return {
-        .scenes =  std::map<std::string, GE::Scene::Descriptor>(
-            std::from_range,
-            m_scenes | std::views::transform([](const auto& pair){ return std::make_pair(pair.second.name, pair.second); })
-        ),
+        .scenes = m_scenes
+                  | std::views::values
+                  | std::views::transform([](const GE::Scene::Descriptor& sceneDescriptor) {
+                        return std::make_pair(sceneDescriptor.name, sceneDescriptor);
+                    })
+                  | std::ranges::to<std::map<std::string, GE::Scene::Descriptor>>(),
         .activeScene = startScene().second.name
     };
 }
diff --git a/src/Game.cpp b/src/Game.cpp
index feea4ad..d82d0cc 100644
--- a/src/Game.cpp
+++ b/src/Game.cpp
@@ -71,7 +71,11 @@ Game::Game(
 )
     : m_makeScriptInstance(std::move(makeScriptInstance))
     , m_listScriptParameters(std::move(listScriptParameters))
-    , m_scenes(std::from_range, descriptor.scenes | std::views::transform([&](const auto& sceneDesc){ return std::make_pair(sceneDesc.first, Scene(assetManager, sceneDesc.second)); }))
+    , m_scenes(descriptor.scenes
+               | std::views::transform([&](const auto& sceneDesc) {
+                     return std::make_pair(sceneDesc.first, Scene(assetManager, sceneDesc.second));
+                 })
+               | std::ranges::to<std::map<std::string, Scene>>())
     , m_inputContext(descriptor.inputContext)
 {
     setActiveScene(descriptor.activeScene);
diff --git a/tests/ECS_testCases.cpp b/tests/ECS_testCases.cpp
index 21e5baf..883d454 100644
--- a/tests/ECS_testCases.cpp
+++ b/tests/ECS_testCases.cpp
@@ -108,30 +108,22 @@ TEST(ECSTest, twoComponent)
     EXPECT_EQ(world.archetypeCount(), 2);
     EXPECT_EQ(world.componentCount(), 1);
 
-    #ifdef NDEBUG
-    EXPECT_ANY_THROW({
-        world.emplace<Component1>(entity, 1);
-    });
-    #else
+#ifndef NDEBUG
     EXPECT_DEATH({
         world.emplace<Component1>(entity, 1);
     }, "");
-    #endif
+#endif
 
     EXPECT_EQ(world.emplace<Component2>(entity, 2).val(), 2);
     EXPECT_EQ(world.entityCount(), 1);
     EXPECT_EQ(world.archetypeCount(), 3);
     EXPECT_EQ(world.componentCount(), 2);
 
-    #ifdef NDEBUG
-    EXPECT_ANY_THROW({
-        world.emplace<Component2>(entity, 2);
-    });
-    #else
+#ifndef NDEBUG
     EXPECT_DEATH({
         world.emplace<Component2>(entity, 2);
     }, "");
-    #endif
+#endif
 
     EXPECT_EQ(world.get<Component1>(entity).val(), 1);
     EXPECT_EQ(world.get<Component2>(entity).val(), 2);