diff --git a/conf/airframes/flixr/conf.xml b/conf/airframes/flixr/conf.xml
index 121f5dd40e..7c8b8295ff 100644
--- a/conf/airframes/flixr/conf.xml
+++ b/conf/airframes/flixr/conf.xml
@@ -50,7 +50,7 @@
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
-   settings="settings/rotorcraft_basic.xml settings/setup_actuators.xml"
+   settings="settings/rotorcraft_basic.xml settings/setup_actuators.xml settings/estimation/ahrs_int_cmpl_quat.xml settings/estimation/ahrs_float_mlkf.xml settings/estimation/ahrs_secondary.xml settings/control/rotorcraft_guidance.xml"
    settings_modules="modules/gps_ubx_ucenter.xml modules/geo_mag.xml modules/air_data.xml"
    gui_color="blue"
   />
diff --git a/conf/airframes/flixr/flixr_lisa_mx.xml b/conf/airframes/flixr/flixr_lisa_mx.xml
index cf13f15b5b..f4d62a3a77 100644
--- a/conf/airframes/flixr/flixr_lisa_mx.xml
+++ b/conf/airframes/flixr/flixr_lisa_mx.xml
@@ -39,9 +39,9 @@
     <subsystem name="gps"           type="ublox"/>
     <subsystem name="stabilization" type="int_quat"/>
     <subsystem name="ahrs"          type="float_mlkf"/>
-    <!--subsystem name="ahrs"          type="int_cmpl_quat">
+    <subsystem name="ahrs"          type="int_cmpl_quat">
       <configure name="SECONDARY_AHRS" value="int_cmpl_quat"/>
-    </subsystem-->
+    </subsystem>
 
     <subsystem name="ins" type="hff"/>