diff --git a/Moose Development/Moose/Ops/ArmyGroup.lua b/Moose Development/Moose/Ops/ArmyGroup.lua
index 9978f55e5..4dff8027c 100644
--- a/Moose Development/Moose/Ops/ArmyGroup.lua	
+++ b/Moose Development/Moose/Ops/ArmyGroup.lua	
@@ -976,6 +976,8 @@ function ARMYGROUP:onafterSpawned(From, Event, To)
     -- Update route.
     if Nwp>1 and self.isMobile then
       self:T(self.lid..string.format("Got %d waypoints on spawn ==> Cruise in -1.0 sec!", Nwp))
+      local wp=self:GetWaypointNext()
+      self.option.Formation=wp.action
       --self:__Cruise(-1, nil, self.option.Formation)
       self:__Cruise(-1)
     else
@@ -1288,6 +1290,7 @@ function ARMYGROUP:onafterUpdateRoute(From, Event, To, n, N, Speed, Formation)
 
   -- Current set speed in m/s.
   self.speedWp=wp.speed
+  self:T(self.lid..string.format("Expected/waypoint speed=%.1f m/s", self.speedWp))
 
   -- Debug output.
   if self.verbose>=10 then --or self.attribute==GROUP.Attribute.GROUND_APC then
diff --git a/Moose Development/Moose/Ops/OpsGroup.lua b/Moose Development/Moose/Ops/OpsGroup.lua
index d8ae870b1..45d2288d9 100644
--- a/Moose Development/Moose/Ops/OpsGroup.lua	
+++ b/Moose Development/Moose/Ops/OpsGroup.lua	
@@ -6684,6 +6684,7 @@ function OPSGROUP:onafterPassingWaypoint(From, Event, To, Waypoint)
   local wpnext=self:GetWaypointNext()
   if wpnext then
     self.speedWp=wpnext.speed
+    self:T(self.lid..string.format("Expected/waypoint speed=%.1f m/s", self.speedWp))
   end
 
 end
@@ -11399,6 +11400,7 @@ function OPSGROUP:_InitWaypoints(WpIndexMin, WpIndexMax)
     -- Expected speed to the first waypoint.
     if i<=2 then
       self.speedWp=wp.speed
+      self:T(self.lid..string.format("Expected/waypoint speed=%.1f m/s", self.speedWp))
     end
 
     -- Speed in knots.