diff --git a/src/PlayerbotFactory.cpp b/src/PlayerbotFactory.cpp
index c6f78887..200402d3 100644
--- a/src/PlayerbotFactory.cpp
+++ b/src/PlayerbotFactory.cpp
@@ -1738,7 +1738,7 @@ void PlayerbotFactory::InitBags(bool destroyOld)
             bot->DestroyItem(INVENTORY_SLOT_BAG_0, slot, true);
         }
         if (old_bag) {
-            return;
+            continue;
         }
         Item* newItem = bot->EquipNewItem(dest, newItemId, true);
         if (newItem)
diff --git a/src/strategy/hunter/HunterTriggers.h b/src/strategy/hunter/HunterTriggers.h
index b64c4b65..6896fd32 100644
--- a/src/strategy/hunter/HunterTriggers.h
+++ b/src/strategy/hunter/HunterTriggers.h
@@ -88,10 +88,10 @@ class FreezingTrapTrigger : public HasCcTargetTrigger
         FreezingTrapTrigger(PlayerbotAI* botAI) : HasCcTargetTrigger(botAI, "freezing trap") { }
 };
 
-class RapidFireTrigger : public BuffTrigger
+class RapidFireTrigger : public BoostTrigger
 {
     public:
-        RapidFireTrigger(PlayerbotAI* botAI) : BuffTrigger(botAI, "rapid fire") { }
+        RapidFireTrigger(PlayerbotAI* botAI) : BoostTrigger(botAI, "rapid fire") { }
 };
 
 class TrueshotAuraTrigger : public BuffTrigger