diff --git a/config/expcore/permission_groups.lua b/config/expcore/permission_groups.lua
index 236268b4..6a78e026 100644
--- a/config/expcore/permission_groups.lua
+++ b/config/expcore/permission_groups.lua
@@ -93,7 +93,9 @@ Permission_Groups.new_group('Guest')
     'use_artillery_remote',
     'launch_rocket',
     'cancel_research',
-    'activate_cut'
+    'activate_cut',
+    'flush_opened_entity_fluid',
+    'flush_opened_entity_specific_fluid'
 }
 
 Permission_Groups.new_group('Restricted')
diff --git a/modules/gui/warp-list.lua b/modules/gui/warp-list.lua
index 50f98d7e..88979247 100644
--- a/modules/gui/warp-list.lua
+++ b/modules/gui/warp-list.lua
@@ -591,12 +591,13 @@ Event.on_nth_tick(math.floor(60/config.update_smoothing), function()
             -- Change the enabled state of the add warp button
             local frame = Gui.get_left_element(player, warp_list_container)
             local add_warp_element = frame.container.header.alignment[add_new_warp.name]
+            local old_closest_warp_name = add_warp_element.tooltip[2] or closest_warp.name
             local was_able_to_make_warp = add_warp_element.enabled
             local can_make_warp = closest_distance > mr2
             if can_make_warp and not was_able_to_make_warp then
                 add_warp_element.enabled = true
                 add_warp_element.tooltip = {'warp-list.add-tooltip'}
-            elseif not can_make_warp and was_able_to_make_warp then
+            elseif not can_make_warp and was_able_to_make_warp or old_closest_warp_name ~= closest_warp.name then
                 add_warp_element.enabled = false
                 add_warp_element.tooltip = {'warp-list.too-close', closest_warp.name}
             end