diff --git a/Data/Scripts/012_Battle/003_Battle/006_Battle_Action_Switching.rb b/Data/Scripts/012_Battle/003_Battle/006_Battle_Action_Switching.rb
index 18e700a94..fc06667d6 100644
--- a/Data/Scripts/012_Battle/003_Battle/006_Battle_Action_Switching.rb
+++ b/Data/Scripts/012_Battle/003_Battle/006_Battle_Action_Switching.rb
@@ -164,8 +164,8 @@ class PokeBattle_Battle
           #       Pokémon when an opponent replaces a fainted Pokémon in single
           #       battles. In double battles, etc. there is no such offer.
           if @internalBattle && @switchStyle && trainerBattle? && pbSideSize(0)==1 &&
-             opposes?(idxBattler) && !@battlers[0].fainted? && pbCanChooseNonActive?(0) &&
-             @battlers[0].effects[PBEffects::Outrage]==0
+             opposes?(idxBattler) && !@battlers[0].fainted? && !switched.include?(0) &&
+             pbCanChooseNonActive?(0) && @battlers[0].effects[PBEffects::Outrage]==0
             idxPartyForName = idxPartyNew
             enemyParty = pbParty(idxBattler)
             if enemyParty[idxPartyNew].ability == :ILLUSION
diff --git a/Data/Scripts/021_Debug/002_Debug_MenuExtraCode.rb b/Data/Scripts/021_Debug/002_Debug_MenuExtraCode.rb
index 8f35e4527..e764fd8dd 100644
--- a/Data/Scripts/021_Debug/002_Debug_MenuExtraCode.rb
+++ b/Data/Scripts/021_Debug/002_Debug_MenuExtraCode.rb
@@ -120,6 +120,7 @@ def pbDebugSetVariable(id,diff)
     pbPlayCursorSE
     $game_variables[id] = [$game_variables[id]+diff,99999999].min
     $game_variables[id] = [$game_variables[id],-99999999].max
+    $game_map.need_refresh = true
   end
 end
 
@@ -133,10 +134,12 @@ def pbDebugVariableScreen(id)
     value = pbMessageChooseNumber(_INTL("Set variable {1}.",id),params)
     $game_variables[id] = [value,99999999].min
     $game_variables[id] = [$game_variables[id],-99999999].max
+    $game_map.need_refresh = true
   elsif $game_variables[id].is_a?(String)
     value = pbMessageFreeText(_INTL("Set variable {1}.",id),
        $game_variables[id],false,250,Graphics.width)
     $game_variables[id] = value
+    $game_map.need_refresh = true
   end
 end
 
@@ -162,6 +165,7 @@ def pbDebugVariables(mode)
         pbPlayDecisionSE
         $game_switches[current_id] = !$game_switches[current_id]
         right_window.refresh
+        $game_map.need_refresh = true
       end
     elsif mode==1 # Variables
       if Input.repeat?(Input::LEFT)
@@ -181,6 +185,7 @@ def pbDebugVariables(mode)
           $game_variables[current_id] = ""
         end
         right_window.refresh
+        $game_map.need_refresh = true
       elsif Input.trigger?(Input::C)
         pbPlayDecisionSE
         pbDebugVariableScreen(current_id)