diff --git a/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua b/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua
index 649d2223e..f479a2170 100644
--- a/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua	
+++ b/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua	
@@ -1670,7 +1670,7 @@ do -- AI_A2A_DISPATCHER
     self:F({SquadronName = SquadronName})
   
     self.DefenderSquadrons[SquadronName] = self.DefenderSquadrons[SquadronName] or {} 
-    self.DefenderSquadrons[SquadronName].Cap = self.DefenderSquadrons[SquadronName].Cap or {}
+    self.DefenderSquadrons[SquadronName].Gci = self.DefenderSquadrons[SquadronName].Gci or {}
 
     local DefenderSquadron = self:GetSquadron( SquadronName )
 
@@ -2688,6 +2688,7 @@ do -- AI_A2A_DISPATCHER
         DefenderCount = DefenderCount + DefenderGroup:GetSize()
       end
   
+      self:F( { DefenderCount = DefenderCount, DefendersMissing = DefendersMissing } )
       DefenderCount = DefendersMissing
   
       local ClosestDistance = 0
@@ -2696,9 +2697,13 @@ do -- AI_A2A_DISPATCHER
       local BreakLoop = false
       
       while( DefenderCount > 0 and not BreakLoop ) do
+      
         self:F( { DefenderSquadrons = self.DefenderSquadrons } )
+
         for SquadronName, DefenderSquadron in pairs( self.DefenderSquadrons or {} ) do
+
           self:F( { GCI = DefenderSquadron.Gci } )
+
           for InterceptID, Intercept in pairs( DefenderSquadron.Gci or {} ) do
       
             self:F( { DefenderSquadron } )
@@ -2737,8 +2742,8 @@ do -- AI_A2A_DISPATCHER
               local DefenderGrouping = DefenderSquadron.Grouping or self.DefenderDefault.Grouping
               local DefendersNeeded = math.ceil( DefenderCount * DefenderOverhead )
               
-              self:F( { DefaultOverhead = self.DefenderDefault.Overhead, Overhead = DefenderOverhead } )
-              self:F( { DefaultGrouping = self.DefenderDefault.Grouping, Grouping = DefenderGrouping } )
+              self:F( { Overhead = DefenderOverhead, SquadronOverhead = DefenderSquadron.Overhead , DefaultOverhead = self.DefenderDefault.Overhead } )
+              self:F( { Grouping = DefenderGrouping, SquadronGrouping = DefenderSquadron.Grouping, DefaultGrouping = self.DefenderDefault.Grouping } )
               self:F( { DefendersCount = DefenderCount, DefendersNeeded = DefendersNeeded } )
               
               while ( DefendersNeeded > 0 ) do
@@ -2760,9 +2765,9 @@ do -- AI_A2A_DISPATCHER
                 self:AddDefenderToSquadron( DefenderSquadron, DefenderGCI, DefenderGrouping )
           
                 if DefenderGCI then
-        
+
                   DefenderCount = DefenderCount - DefenderGrouping
-                  
+        
                   local Fsm = AI_A2A_GCI:New( DefenderGCI, Gci.EngageMinSpeed, Gci.EngageMaxSpeed )
                   Fsm:SetDispatcher( self )
                   Fsm:SetHomeAirbase( DefenderSquadron.Airbase )
diff --git a/Moose Development/Moose/Functional/Detection.lua b/Moose Development/Moose/Functional/Detection.lua
index 2e0dd9363..2b67e54dd 100644
--- a/Moose Development/Moose/Functional/Detection.lua	
+++ b/Moose Development/Moose/Functional/Detection.lua	
@@ -1152,11 +1152,12 @@ do -- DETECTION_BASE
     -- @return #DETECTION_BASE 
     function DETECTION_BASE:SetFriendlyPrefixes( FriendlyPrefixes )
 
-      self.FriendlyPrefixes = FriendlyPrefixes or {}
+      self.FriendlyPrefixes = self.FriendlyPrefixes or {}
       if type( FriendlyPrefixes ) ~= "table" then
         FriendlyPrefixes = { FriendlyPrefixes }
       end
       for PrefixID, Prefix in pairs( FriendlyPrefixes ) do
+        self:F( { FriendlyPrefix = Prefix } )
         self.FriendlyPrefixes[Prefix] = Prefix
       end
       return self