diff --git a/exp_legacy/module/modules/addons/spawn-area.lua b/exp_legacy/module/modules/addons/spawn-area.lua
index 568fa0af..9e3de144 100644
--- a/exp_legacy/module/modules/addons/spawn-area.lua
+++ b/exp_legacy/module/modules/addons/spawn-area.lua
@@ -61,7 +61,7 @@ local function spawn_turrets()
 
         -- Makes a new turret if it is not found
         if not turret or not turret.valid then
-            turret = surface.create_entity{ name = "gun-turret", position = pos, force = "spawn" }
+            turret = surface.create_entity{ name = "gun-turret", position = pos, force = "neutral" }
             if not turret then return end
             protect_entity(turret)
         end
diff --git a/exp_legacy/module/modules/control/warps.lua b/exp_legacy/module/modules/control/warps.lua
index b6cad0a9..9a3f905f 100644
--- a/exp_legacy/module/modules/control/warps.lua
+++ b/exp_legacy/module/modules/control/warps.lua
@@ -189,6 +189,10 @@ function Warps.make_warp_area(warp_id)
         if entity.type == "electric-pole" then
             warp.electric_pole = entity
         end
+
+        if entity.name == "small-lamp" then
+            warp.always_on = true
+        end
     end
 end