diff --git a/quant.ew/files/core/player_fns.lua b/quant.ew/files/core/player_fns.lua
index c1863129..eea414eb 100644
--- a/quant.ew/files/core/player_fns.lua
+++ b/quant.ew/files/core/player_fns.lua
@@ -543,6 +543,9 @@ function player_fns.replace_player_entity(new_entity, player_data)
         local old_entity = player_data.entity
         player_data.entity = new_entity
         ctx.player_data_by_local_entity[new_entity] = player_data
+        if player_data.peer_id ~= ctx.my_player.peer_id then
+            EntityAddComponent2(new_entity, "StreamingKeepAliveComponent")
+        end
         print("Replaced player entity: "..old_entity.." -> "..new_entity)
     else
         player_fns.spawn_player_for(player_data.peer_id, 0, 0, player_data)
diff --git a/quant.ew/files/system/notplayer_ai/notplayer_ai.lua b/quant.ew/files/system/notplayer_ai/notplayer_ai.lua
index ec06be4b..7b5d0187 100644
--- a/quant.ew/files/system/notplayer_ai/notplayer_ai.lua
+++ b/quant.ew/files/system/notplayer_ai/notplayer_ai.lua
@@ -463,14 +463,14 @@ local function init_state()
         _tags = "aiming_reticle",
         alpha = 1,
         image_file = "data/ui_gfx/mouse_cursor.png",
-        ui_is_parent = 0,
+        ui_is_parent = false,
         offset_x = 6,
         offset_y = 35,
-        has_special_scale = 1,
+        has_special_scale = true,
         special_scale_x = 1,
         special_scale_y = 1,
         z_index = -10000,
-        emissive = 1,
+        emissive = true,
     })
     local damage_model = EntityGetFirstComponentIncludingDisabled(ctx.my_player.entity, "DamageModelComponent")
     if ctx.proxy_opt.no_material_damage then
diff --git a/quant.ew/files/system/player_tether/player_tether.lua b/quant.ew/files/system/player_tether/player_tether.lua
index 21d399c9..455280d7 100644
--- a/quant.ew/files/system/player_tether/player_tether.lua
+++ b/quant.ew/files/system/player_tether/player_tether.lua
@@ -187,6 +187,10 @@ local was_notplayer = false
 
 function module.on_world_update()
     if GameGetFrameNum() % 10 == 7 then
+        local host_playerdata = player_fns.peer_get_player_data(ctx.host_id, true)
+        if ctx.proxy_opt.perma_death and (not ctx.my_player.status.is_alive or not host_playerdata.is_alive) then
+            return
+        end
         local x2, y2 = EntityGetTransform(ctx.my_player.entity)
         if np.GetGameModeNr() ~= 2
                 and tonumber(SessionNumbersGetValue("NEW_GAME_PLUS_COUNT")) == 0
@@ -215,7 +219,6 @@ function module.on_world_update()
         if ctx.my_id == ctx.host_id then
             return
         end
-        local host_playerdata = player_fns.peer_get_player_data(ctx.host_id, true)
         if host_playerdata == nil or host_playerdata.entity == nil or not EntityGetIsAlive(host_playerdata.entity) then
             return
         end