diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp
index f39db1abe..d720f6118 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp
+++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp
@@ -147,7 +147,7 @@ void OutputCalibrationPage::setupVehicle()
            ui->vehicleView->setScene(m_vehicleScene);
     	}
 	qDebug() << "no clue what a wizard index is!";
-        m_wizardIndexes << 0 << 1 << 1 << 1 << 1 << 1;
+        m_wizardIndexes << 0 << 1 << 2 << 2 << 2 << 2; // These come from OutputCalibrationPage::setWizardPage()
         m_vehicleElementIds << "fixed-aileron" << "aileron";
         m_vehicleHighlightElementIndexes << 0 << 1;
         m_channelIndex << 0 << 0 << 1 << 2 << 3 << 4;
@@ -179,7 +179,7 @@ void OutputCalibrationPage::setupVehicle()
            ui->vehicleView->setScene(m_vehicleScene);
     	}
 	qDebug() << "no clue what a wizard index is!";
-        m_wizardIndexes << 0 << 1 << 1 << 1;
+        m_wizardIndexes << 0 << 2 << 2 << 2; // These come from OutputCalibrationPage::setWizardPage()
         m_vehicleElementIds << "fixed-vtail" << "vtail";
         m_vehicleHighlightElementIndexes << 0 << 1;
         m_channelIndex << 0 << 0 << 1 << 2;
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
index d32d0146a..5de6ae900 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
+++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
@@ -306,7 +306,23 @@ void VehicleConfigurationHelper::applyActuatorConfiguration()
         addModifiedObject(actSettings, tr("Writing actuator settings"));
         break;
     }
+/*
     case VehicleConfigurationSource::VEHICLE_FIXEDWING:
+    {
+        ActuatorSettings::DataFields data = actSettings->getData();
+
+	qDebug() << "Override center pulse for fixed wing servos\n";
+	// move all but first chan to 1500 center pluse
+        QList<actuatorChannelSettings> actuatorSettings = m_configSource->getActuatorSettings();
+        for (quint16 i = 1; i < ActuatorSettings::CHANNELMAX_NUMELEM; i++) {
+            data.ChannelType[i]    = ActuatorSettings::CHANNELTYPE_PWM;
+            data.ChannelAddr[i]    = i;
+            data.ChannelMin[i]     = 1500;
+            data.ChannelNeutral[i] = 1500;
+            data.ChannelMax[i]     = 1500;
+        }
+    }
+*/
     case VehicleConfigurationSource::VEHICLE_HELI:
     case VehicleConfigurationSource::VEHICLE_SURFACE:
         // TODO: Implement settings for other vehicle types?
@@ -1388,5 +1404,5 @@ void VehicleConfigurationHelper::setupAileron()
     guiSettings.fixedwing.FixedWingYaw1  = 5;
 
     applyMixerConfiguration(channels);
-    applyMultiGUISettings(SystemSettings::AIRFRAMETYPE_FIXEDWINGAILERON, guiSettings);
+    applyMultiGUISettings(SystemSettings::AIRFRAMETYPE_FIXEDWING, guiSettings);
 }