diff --git a/src/AiFactory.cpp b/src/AiFactory.cpp
index aaf68e4c..165526cd 100644
--- a/src/AiFactory.cpp
+++ b/src/AiFactory.cpp
@@ -353,13 +353,13 @@ void AiFactory::AddDefaultCombatStrategies(Player* player, PlayerbotAI* const fa
             break;
         case CLASS_DEATH_KNIGHT:
             if (tab == 0)
-                engine->addStrategies("blood", nullptr);
+                engine->addStrategies("blood", "tank assist", nullptr);
             else if (tab == 1)
                 engine->addStrategies("frost", "frost aoe", "dps assist", "threat", nullptr);
             else
                 engine->addStrategies("unholy", "unholy aoe", "dps assist", "threat", nullptr);
 
-            engine->addStrategies("dps assist", "close", nullptr);
+            engine->addStrategies("close", nullptr);
 
             break;
     }
diff --git a/src/PlayerbotFactory.cpp b/src/PlayerbotFactory.cpp
index 91b01d11..d16e4614 100644
--- a/src/PlayerbotFactory.cpp
+++ b/src/PlayerbotFactory.cpp
@@ -3002,7 +3002,7 @@ float PlayerbotFactory::CalculateItemScore(uint32 item_id)
         // spec without double hand
         // enhancement, rogue, ice dk, shield tank
         if (isDoubleHand && 
-            ((cls == CLASS_SHAMAN && tab == 1) ||
+            ((cls == CLASS_SHAMAN && tab == 1 && bot->HasSpell(674)) ||
             (cls == CLASS_ROGUE) ||
             (cls == CLASS_DEATH_KNIGHT && tab == 1) ||
             IsShieldTank())) {
@@ -3014,7 +3014,8 @@ float PlayerbotFactory::CalculateItemScore(uint32 item_id)
             ((cls == CLASS_WARRIOR && tab == 1 && bot->HasSpell(46917)) ||
             (cls == CLASS_DRUID && tab == 1) ||
             (cls == CLASS_PALADIN && tab == 2) ||
-            (cls == CLASS_DEATH_KNIGHT && tab == 0))) {
+            (cls == CLASS_DEATH_KNIGHT && tab == 0) ||
+            (cls == CLASS_SHAMAN && tab == 1 && !bot->HasSpell(674)))) {
             score *= 10;
         }
     }
diff --git a/src/PlayerbotMgr.cpp b/src/PlayerbotMgr.cpp
index 4b7ddc45..d1c5bf9c 100644
--- a/src/PlayerbotMgr.cpp
+++ b/src/PlayerbotMgr.cpp
@@ -623,6 +623,7 @@ std::vector<std::string> PlayerbotHolder::HandlePlayerbotCommand(char const* arg
     if (!*args)
     {
         messages.push_back("usage: list/reload/tweak/self or add/init/remove PLAYERNAME");
+        messages.push_back("       addclass CLASSNAME");
         return messages;
     }
 
@@ -631,6 +632,7 @@ std::vector<std::string> PlayerbotHolder::HandlePlayerbotCommand(char const* arg
     if (!cmd)
     {
         messages.push_back("usage: list/reload/tweak/self or add/init/remove PLAYERNAME");
+        messages.push_back("       addclass CLASSNAME");
         return messages;
     }