diff --git a/conf/airframes/ENAC/fixed-wing/disco.xml b/conf/airframes/ENAC/fixed-wing/disco.xml
index e9bfac32a4..d421fce79f 100644
--- a/conf/airframes/ENAC/fixed-wing/disco.xml
+++ b/conf/airframes/ENAC/fixed-wing/disco.xml
@@ -10,10 +10,13 @@
     <configure name="PERIODIC_FREQUENCY" value="120"/>
     <configure name="USE_MAGNETOMETER" value="TRUE"/>
 
-    <target name="ap" board="disco"/>
-    <target name="sim" board="pc"/>
+    <target name="ap" board="disco">
+      <module name="radio_control" type="sbus"/>
+    </target>
+    <target name="sim" board="pc">
+      <module name="radio_control" type="ppm"/>
+    </target>
 
-    <module name="radio_control" type="sbus"/>
     <module name="telemetry" type="transparent_udp"/>
 
     <module name="imu" type="disco"/>
diff --git a/conf/airframes/tudelft/aa_quadplane.xml b/conf/airframes/tudelft/aa_quadplane.xml
index 12d6a3d3e3..7ceccab7ef 100644
--- a/conf/airframes/tudelft/aa_quadplane.xml
+++ b/conf/airframes/tudelft/aa_quadplane.xml
@@ -1,7 +1,9 @@
 <!DOCTYPE airframe SYSTEM "../airframe.dtd">
 
 <airframe name="Quadplane LisaM_2.0 pwm">
-  <description>Quadplane: modified mini-talon with 6inch quadrotor.
+  <description>Quadplane:
+ - modified mini-talon with cobra 2814/16 Kv1050 running a 10x8 prop
+ - quad with KISS esc + cobra 2207/2450kv running 6x3 props
   </description>
 <!--   FIRMWARE    -->
 
@@ -36,6 +38,11 @@
     <module name="ins"/>
 
     <!--define name="KILL_ON_GROUND_DETECT" value="TRUE"/-->
+
+    <module name="gps" type="ubx_ucenter"/>
+    <module name="geo_mag"/>
+    <module name="air_data"/>
+
   </firmware>
 
 <!--   COMMANDS    -->
@@ -99,12 +106,6 @@
   </section>
 
 
-  <modules>
-    <module name="gps" type="ubx_ucenter"/>
-    <module name="geo_mag"/>
-    <module name="air_data"/>
-  </modules>
-
   <section name="MIXING" prefix="MOTOR_MIXING_">
     <define name="NB_MOTOR" value="4"/>
     <define name="SCALE" value="256"/>