diff --git a/Data/Scripts/012_Battle/001_Battler/004_Battler_Statuses.rb b/Data/Scripts/012_Battle/001_Battler/004_Battler_Statuses.rb
index a74037885..c87f5f18d 100644
--- a/Data/Scripts/012_Battle/001_Battler/004_Battler_Statuses.rb
+++ b/Data/Scripts/012_Battle/001_Battler/004_Battler_Statuses.rb
@@ -171,7 +171,7 @@ class PokeBattle_Battler
     return true
   end
 
-  def pbCanSynchronizeStatus?(status,target)
+  def pbCanSynchronizeStatus?(newStatus,target)
     return false if fainted?
     # Trying to replace a status problem with another one
     return false if self.status!=PBStatuses::NONE
@@ -179,7 +179,7 @@ class PokeBattle_Battler
     return false if @battle.field.terrain==PBBattleTerrains::Misty && affectedByTerrain?
     # Type immunities
     hasImmuneType = false
-    case self.status
+    case newStatus
     when PBStatuses::POISON
       # NOTE: target will have Synchronize, so it can't have Corrosion.
       if !(target && target.hasActiveAbility?(:CORROSION))
@@ -193,15 +193,15 @@ class PokeBattle_Battler
     end
     return false if hasImmuneType
     # Ability immunity
-    if BattleHandlers.triggerStatusImmunityAbilityNonIgnorable(@ability,self,status)
+    if BattleHandlers.triggerStatusImmunityAbilityNonIgnorable(@ability,self,newStatus)
       return false
     end
-    if abilityActive? && BattleHandlers.triggerStatusImmunityAbility(@ability,self,status)
+    if abilityActive? && BattleHandlers.triggerStatusImmunityAbility(@ability,self,newStatus)
       return false
     end
     eachAlly do |b|
       next if !b.abilityActive?
-      next if !BattleHandlers.triggerStatusImmunityAllyAbility(b.ability,self,status)
+      next if !BattleHandlers.triggerStatusImmunityAllyAbility(b.ability,self,newStatus)
       return false
     end
     # Safeguard immunity
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 b81a2a9e3..f1879eec3 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
@@ -245,7 +245,7 @@ class PokeBattle_Battle
         pbDisplayBrief(_INTL("{1}, switch out! Come back!",battler.name))
       end
     else
-      owner = pbGetOwnerName(b.index)
+      owner = pbGetOwnerName(battler.index)
       pbDisplayBrief(_INTL("{1} withdrew {2}!",owner,battler.name))
     end
   end
diff --git a/Data/Scripts/012_Battle/004_AI/003_AI_Switch.rb b/Data/Scripts/012_Battle/004_AI/003_AI_Switch.rb
index 197a27201..0690abf1b 100644
--- a/Data/Scripts/012_Battle/004_AI/003_AI_Switch.rb
+++ b/Data/Scripts/012_Battle/004_AI/003_AI_Switch.rb
@@ -135,7 +135,7 @@ class PokeBattle_AI
         if @battle.pbRegisterSwitch(idxBattler,list[0])
           PBDebug.log("[AI] #{battler.pbThis} (#{idxBattler}) will switch with " +
                       "#{@battle.pbParty(idxBattler)[list[0]].name}")
-          return
+          return true
         end
       end
     end