diff --git a/conf/airframes/OPENUAS/openuas_conf.xml b/conf/airframes/OPENUAS/openuas_conf.xml
index f9d349e288..93f5114f71 100644
--- a/conf/airframes/OPENUAS/openuas_conf.xml
+++ b/conf/airframes/OPENUAS/openuas_conf.xml
@@ -84,7 +84,7 @@
    telemetry="telemetry/default_fixedwing_imu_9k6.xml"
    flight_plan="flight_plans/OPENUAS/openuas_obc2014_kingaroy.xml"
    settings="settings/control/ctl_energy.xml settings/estimation/ac_char.xml settings/fixedwing_basic.xml"
-   settings_modules="modules/gps.xml modules/air_data.xml modules/gps_ubx_ucenter.xml modules/airspeed_adc.xml modules/tune_airspeed.xml modules/photogrammetry_calculator.xml modules/digital_cam_uart.xml modules/nav_survey_poly_osam.xml modules/nav_smooth.xml"
+   settings_modules="modules/imu_common.xml modules/ahrs_int_cmpl_quat.xml modules/gps.xml modules/gps_ubx_ucenter.xml modules/air_data.xml modules/airspeed_adc.xml modules/tune_airspeed.xml modules/photogrammetry_calculator.xml modules/digital_cam_uart.xml modules/nav_survey_poly_osam.xml modules/nav_smooth.xml"
    gui_color="#fffffac7c07a"
   />
 </conf>
diff --git a/conf/airframes/OPENUAS/openuas_vivify.xml b/conf/airframes/OPENUAS/openuas_vivify.xml
index 155de6107f..2766b92018 100644
--- a/conf/airframes/OPENUAS/openuas_vivify.xml
+++ b/conf/airframes/OPENUAS/openuas_vivify.xml
@@ -92,6 +92,7 @@
         <configure name="GPS_PORT" value="UART3"/>
         <configure name="GPS_BAUD" value="B38400"/>
       </module>
+      <module name="gps" type="ubx_ucenter"/><!-- WARNING: make sure to disable SBAS for Australia -->
 
       <!-- * Add Navigation routines -->
       <module name="navigation"/>
@@ -201,8 +202,6 @@
       <define name="AIR_DATA_CALC_AMSL_BARO" value="TRUE" />
     </module>
     <!-- CDW: module name="obc2014"/-->
-    <!-- GPS -->
-    <module name="gps" type="ubx_ucenter"/><!-- WARNING: make sure to disable SBAS for Australia -->
     <!-- Load -->
     <!-- module name="sys_mon"/> -->
     <!--
diff --git a/conf/airframes/TUDELFT/tudelft_conf.xml b/conf/airframes/TUDELFT/tudelft_conf.xml
index 2352dc0795..16cffad95b 100644
--- a/conf/airframes/TUDELFT/tudelft_conf.xml
+++ b/conf/airframes/TUDELFT/tudelft_conf.xml
@@ -120,6 +120,17 @@
    settings_modules="modules/gps_ubx_ucenter.xml modules/imu_common.xml modules/gps.xml modules/ahrs_int_cmpl_quat.xml"
    gui_color="blue"
   />
+  <aircraft
+   name="DelftaCopter"
+   ac_id="6"
+   airframe="airframes/TUDELFT/tudelft_outback.xml"
+   radio="radios/dummy.xml"
+   telemetry="telemetry/TUDELFT/tudelft_outback.xml"
+   flight_plan="flight_plans/rotorcraft_basic.xml"
+   settings="settings/rotorcraft_basic.xml settings/control/stabilization_att_int.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_rate.xml"
+   settings_modules="modules/imu_common.xml modules/gps.xml modules/ahrs_int_cmpl_quat.xml modules/opa_controller.xml modules/geo_mag.xml modules/air_data.xml modules/temp_adc.xml modules/logger_sd_spi_direct.xml modules/gps_ubx_ucenter.xml"
+   gui_color="#ffffdffac31f"
+  />
   <aircraft
    name="GeniusDD"
    ac_id="129"
@@ -252,17 +263,6 @@
    settings_modules="modules/imu_common.xml modules/ahrs_int_cmpl_quat.xml modules/gps.xml modules/air_data.xml modules/geo_mag.xml modules/gps_ubx_ucenter.xml modules/light.xml modules/digital_cam.xml"
    gui_color="white"
   />
-  <aircraft
-   name="Outback"
-   ac_id="6"
-   airframe="airframes/TUDELFT/tudelft_outback.xml"
-   radio="radios/dummy.xml"
-   telemetry="telemetry/TUDELFT/tudelft_outback.xml"
-   flight_plan="flight_plans/TUDELFT/obc2016/obc2016.xml"
-   settings="settings/rotorcraft_basic.xml settings/control/stabilization_att_int.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_rate.xml"
-   settings_modules="modules/imu_common.xml modules/gps.xml modules/ahrs_int_cmpl_quat.xml modules/opa_controller.xml modules/air_data.xml modules/temp_adc.xml modules/logger_sd_spi_direct.xml modules/gps_ubx_ucenter.xml"
-   gui_color="#ffffdffac31f"
-  />
   <aircraft
    name="Quad_Navstik"
    ac_id="50"