diff --git a/src/AutoPilotPlugins/APM/APMAirframeComponent.qml b/src/AutoPilotPlugins/APM/APMAirframeComponent.qml
index 15becef..a11e838 100644
--- a/src/AutoPilotPlugins/APM/APMAirframeComponent.qml
+++ b/src/AutoPilotPlugins/APM/APMAirframeComponent.qml
@@ -37,7 +37,7 @@ SetupPage {
             property real _margins:             ScreenTools.defaultFontPixelWidth
             property Fact _frameClass:          controller.getParameterFact(-1, "FRAME_CLASS")
             property Fact _frameType:           controller.getParameterFact(-1, "FRAME_TYPE", false)    // FRAME_TYPE is not available on all Rover versions
-            property bool _frameTypeAvailable:  controller.parameterExists(-1, "FRAME_TYPE")
+            property bool _frameTypeAvailable:  controller.vehicle.multiRotor
 
             readonly property real spacerHeight: ScreenTools.defaultFontPixelHeight
 
@@ -72,7 +72,7 @@ SetupPage {
                                          qsTr("Currently set to frame class '%1'").arg(_frameClass.enumStringValue) +
                                          (_frameTypeAvailable ?  qsTr(" and frame type '%2'").arg(_frameType.enumStringValue) : "") +
                                          qsTr(".", "period for end of sentence")) +
-                                    qsTr(" To change this configuration, select the desired frame class below and frame type.")
+                                    qsTr(" To change this configuration, select the desired frame class below.")
                 font.family:        ScreenTools.demiboldFontFamily
                 wrapMode:           Text.WordWrap
             }
diff --git a/src/AutoPilotPlugins/APM/APMAirframeComponentController.cc b/src/AutoPilotPlugins/APM/APMAirframeComponentController.cc
index b463d08..6fa0128 100644
--- a/src/AutoPilotPlugins/APM/APMAirframeComponentController.cc
+++ b/src/AutoPilotPlugins/APM/APMAirframeComponentController.cc
@@ -308,6 +308,8 @@ APMFrameClass::APMFrameClass(const QString& name, bool copter, int frameClass, F
                 _frameTypeEnumStrings.append(frameTypeFact->enumStrings()[index]);
             }
         }
+    } else {
+        _imageResourceDefault = imageResource();
     }
 
     // If the frameClass is not in the list then frame type is not supported