diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index a9272837a8b4358c3139649341b13e1a9944602d..f67d991a661768289c6e04ba2733f1ee4d014916 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -7,7 +7,7 @@
 # License terms set in COPYING.md
 # -------------------------------------------------
 
-QMAKE_PROJECT_DEPTH = 0 # undocumented qmake flag to force absolute paths in make files
+QMAKE_PROJECT_DEPTH = 0 # undocumented qmake flag to force absolute paths in makefiles
 
 # These are disabled until proven correct
 DEFINES += QGC_GST_TAISYNC_DISABLED
diff --git a/src/FactSystem/FactMetaData.h b/src/FactSystem/FactMetaData.h
index 6c555f225994fe675a00600bd50a6a934f8cd093..31f4fbec1b0863351be28c31c87d012129df51a4 100644
--- a/src/FactSystem/FactMetaData.h
+++ b/src/FactSystem/FactMetaData.h
@@ -201,12 +201,7 @@ private:
     void _setAppSettingsTranslators(void);
 
 
-    /**
-     * @brief Clamp a value based in the cookedMin and CookedMax values
-     *
-     * @tparam T
-     * @param variantValue
-     */
+    /// Clamp a value to be within cookedMin and cookedMax
     template<class T>
     void clamp(QVariant& variantValue) const {
         if (cookedMin().value<T>() > variantValue.value<T>()) {
@@ -216,44 +211,17 @@ private:
         }
     }
 
-    /**
-     * @brief Check if value is inside cooked limits
-     *
-     * @tparam T
-     * @param variantValue
-     */
     template<class T>
     bool isInCookedLimit(const QVariant& variantValue) const {
-        return cookedMin().value<T>() < variantValue.value<T>() && variantValue.value<T>() < cookedMax().value<T>();
+        return cookedMin().value<T>() <= variantValue.value<T>() && variantValue.value<T>() <= cookedMax().value<T>();
     }
 
-    /**
-     * @brief Check if value is inside raw limits
-     *
-     * @tparam T
-     * @param variantValue
-     */
     template<class T>
     bool isInRawLimit(const QVariant& variantValue) const {
-        return rawMin().value<T>() <= variantValue.value<T>() && variantValue.value<T>() < rawMax().value<T>();
+        return rawMin().value<T>() <= variantValue.value<T>() && variantValue.value<T>() <= rawMax().value<T>();
     }
 
-    /**
-     * @brief Check if value if over min limit
-     *
-     * @param variantValue
-     * @return true
-     * @return false
-     */
     bool isInRawMinLimit(const QVariant& variantValue) const;
-
-    /**
-     * @brief Check if value is lower than upper limit
-     *
-     * @param variantValue
-     * @return true
-     * @return false
-     */
     bool isInRawMaxLimit(const QVariant& variantValue) const;
 
     // Built in translators
diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc
index 9f89556a41305a3267b0a0ce3f226e2a792e7a80..3dd30e93ca5ec903b1e90147db8210a622ce35aa 100644
--- a/src/Vehicle/Vehicle.cc
+++ b/src/Vehicle/Vehicle.cc
@@ -428,11 +428,13 @@ Vehicle::Vehicle(MAV_AUTOPILOT              firmwareType,
     , _clockFactGroup(this)
     , _distanceSensorFactGroup(this)
 {
-    _commonInit();
-
+    // This will also set the settings based firmware/vehicle types. So it needs to happen first.
     if (_firmwareType == MAV_AUTOPILOT_TRACK) {
         trackFirmwareVehicleTypeChanges();
     }
+
+    _commonInit();
+
     connect(_settingsManager->appSettings()->offlineEditingCruiseSpeed(),   &Fact::rawValueChanged, this, &Vehicle::_offlineCruiseSpeedSettingChanged);
     connect(_settingsManager->appSettings()->offlineEditingHoverSpeed(),    &Fact::rawValueChanged, this, &Vehicle::_offlineHoverSpeedSettingChanged);