diff --git a/Data/Scripts/011_Battle/004_Scene/006_Battle_Scene_Objects.rb b/Data/Scripts/011_Battle/004_Scene/006_Battle_Scene_Objects.rb
index 49c3dd968..907a796df 100644
--- a/Data/Scripts/011_Battle/004_Scene/006_Battle_Scene_Objects.rb
+++ b/Data/Scripts/011_Battle/004_Scene/006_Battle_Scene_Objects.rb
@@ -203,12 +203,12 @@ class Battle::Scene::PokemonDataBox < Sprite
     return @anim_exp_timer_start != nil
   end
 
-  def pbDrawNumber(number, btmp, startX, startY, align = 0)
+  def pbDrawNumber(number, btmp, startX, startY, align = :left)
     # -1 means draw the / character
     n = (number == -1) ? [10] : number.to_i.digits.reverse
     charWidth  = @numbersBitmap.width / 11
     charHeight = @numbersBitmap.height
-    startX -= charWidth * n.length if align == 1
+    startX -= charWidth * n.length if align == :right
     n.each do |i|
       btmp.blt(startX, startY, @numbersBitmap.bitmap, Rect.new(i * charWidth, 0, charWidth, charHeight))
       startX += charWidth
@@ -303,7 +303,7 @@ class Battle::Scene::PokemonDataBox < Sprite
     return if !@battler.pokemon
     # Show HP numbers
     if @show_hp_numbers
-      pbDrawNumber(self.hp, @hpNumbers.bitmap, 54, 2, 1)
+      pbDrawNumber(self.hp, @hpNumbers.bitmap, 54, 2, :right)
       pbDrawNumber(-1, @hpNumbers.bitmap, 54, 2)   # / char
       pbDrawNumber(@battler.totalhp, @hpNumbers.bitmap, 70, 2)
     end
diff --git a/Data/Scripts/011_Battle/005_AI/002_AI_Switch.rb b/Data/Scripts/011_Battle/005_AI/002_AI_Switch.rb
index 2a2e8b2af..f00ca35ad 100644
--- a/Data/Scripts/011_Battle/005_AI/002_AI_Switch.rb
+++ b/Data/Scripts/011_Battle/005_AI/002_AI_Switch.rb
@@ -118,7 +118,7 @@ class Battle::AI
         score -= 20 if pokemon_can_be_poisoned?(pkmn)
       end
       # Sticky Web
-      if @user.pbOwnSide.effects[PBEffects::ToxicSpikes]
+      if @user.pbOwnSide.effects[PBEffects::StickyWeb]
         score -= 15
       end
     end