diff --git a/Source/Framework/RecastDetour/Detour/DetourCommon.cs b/Source/Framework/RecastDetour/Detour/DetourCommon.cs
index 56b320abf..1c8e9c1a2 100644
--- a/Source/Framework/RecastDetour/Detour/DetourCommon.cs
+++ b/Source/Framework/RecastDetour/Detour/DetourCommon.cs
@@ -3,7 +3,6 @@ using System.Numerics;
 
 public static partial class Detour
 {
-
     /**
     @defgroup detour Detour
 
diff --git a/Source/Framework/RecastDetour/Detour/DetourNavMesh.cs b/Source/Framework/RecastDetour/Detour/DetourNavMesh.cs
index a4ebafe33..3cf0a6559 100644
--- a/Source/Framework/RecastDetour/Detour/DetourNavMesh.cs
+++ b/Source/Framework/RecastDetour/Detour/DetourNavMesh.cs
@@ -730,7 +730,7 @@ public static partial class Detour
 
         void closestPointOnDetailEdges(bool onlyBoundary, dtMeshTile tile, dtPoly poly, float[] pos, float[] closest)
         {
-            uint ip = (uint)tile.polys.ToList().IndexOf(poly);
+            int ip = Array.IndexOf(tile.polys, poly);
             dtPolyDetail pd = tile.detailMeshes[ip];
 
             float dmin = float.MaxValue;
@@ -789,7 +789,7 @@ public static partial class Detour
             if (poly.getType() == (byte)dtPolyTypes.DT_POLYTYPE_OFFMESH_CONNECTION)
                 return false;
 
-            uint ip = (uint)Array.IndexOf(tile.polys, poly);
+            int ip = Array.IndexOf(tile.polys, poly);
             dtPolyDetail pd = tile.detailMeshes[ip];
 
             float[] verts = new float[DT_VERTS_PER_POLYGON * 3];
@@ -849,7 +849,6 @@ public static partial class Detour
 
         public void closestPointOnPoly(dtPolyRef polyRef, float[] pos, float[] closest, ref bool posOverPoly)
         {
-
             dtMeshTile tile = new();
             dtPoly poly = new();
             getTileAndPolyByRefUnsafe(polyRef, ref tile, ref poly);
diff --git a/Source/Game/Chat/Commands/MiscCommands.cs b/Source/Game/Chat/Commands/MiscCommands.cs
index aeac8f8d0..4842955d2 100644
--- a/Source/Game/Chat/Commands/MiscCommands.cs
+++ b/Source/Game/Chat/Commands/MiscCommands.cs
@@ -2124,7 +2124,7 @@ namespace Game.Chat
 
             if (args[0] == '[')                                        // [name] manual form
             {
-                string itemName = args.NextString("]");
+                string itemName = args.NextString("]").Substring(1);
 
                 if (!string.IsNullOrEmpty(itemName))
                 {
diff --git a/Source/Game/Entities/Unit/Unit.Combat.cs b/Source/Game/Entities/Unit/Unit.Combat.cs
index 816b2c947..2fce6f825 100644
--- a/Source/Game/Entities/Unit/Unit.Combat.cs
+++ b/Source/Game/Entities/Unit/Unit.Combat.cs
@@ -250,6 +250,9 @@ namespace Game.Entities
                     return;
             }
 
+            if (!extraAttacksTargets.ContainsKey(targetGUID))
+                extraAttacksTargets[targetGUID] = 0;
+
             extraAttacksTargets[targetGUID] += count;
         }