diff --git a/conf/flight_plans/formation/form_follow.xml b/conf/flight_plans/formation/form_follow.xml
index 0280b01dbd..39d95e17ed 100644
--- a/conf/flight_plans/formation/form_follow.xml
+++ b/conf/flight_plans/formation/form_follow.xml
@@ -9,6 +9,10 @@
     <waypoint alt="260.0" name="WAIT1" x="118.0" y="84.9"/>
     <waypoint alt="240.0" name="WAIT2" x="-34.4" y="143.5"/>
   </waypoints>
+  <modules>
+    <module name="traffic_info"/>
+    <module name="formation_flight"/>
+  </modules>
   <blocks>
     <block name="init formation">
       <!-- formation_init() is already called -->
diff --git a/conf/flight_plans/formation/form_leader.xml b/conf/flight_plans/formation/form_leader.xml
index 2247f4b8af..92eb108d3f 100644
--- a/conf/flight_plans/formation/form_leader.xml
+++ b/conf/flight_plans/formation/form_leader.xml
@@ -14,6 +14,10 @@
     <waypoint alt="210.0" name="AF" x="187.0" y="-2.8"/>
     <waypoint alt="185.0" name="RWAY" x="42.3" y="47.5"/>
   </waypoints>
+  <modules>
+    <module name="traffic_info"/>
+    <module name="formation_flight"/>
+  </modules>
   <blocks>
     <block name="init formation">
       <!-- formation_init() is already called -->
diff --git a/sw/airborne/modules/multi/formation.h b/sw/airborne/modules/multi/formation.h
index dbfc1befe3..760923d5bb 100644
--- a/sw/airborne/modules/multi/formation.h
+++ b/sw/airborne/modules/multi/formation.h
@@ -7,7 +7,7 @@
 #ifndef FORMATION_H
 #define FORMATION_H
 
-//#include "subsystems/datalink/datalink.h" // dl_buffer
+#include "subsystems/datalink/datalink.h" // dl_buffer
 #include "generated/airframe.h"           // AC_ID
 #include "modules/multi/traffic_info.h"
 
@@ -43,7 +43,7 @@ static inline void updateSlot(uint8_t id, float se, float sn, float sa)
 
 static inline void updateFormationStatus(uint8_t id, uint8_t status) { formation[ti_acs_id[id]].status = status; }
 
-static inline void parseFormationStatus(uint8_t *buff)
+static inline void parseFormationStatus(uint8_t *buf)
 {
   uint8_t ac_id = DL_FORMATION_STATUS_ac_id(buf);
   uint8_t leader = DL_FORMATION_STATUS_leader_id(buf);