diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp
index 24d789fa0..7a4407c3a 100644
--- a/companion/src/firmwares/opentx/opentxeeprom.cpp
+++ b/companion/src/firmwares/opentx/opentxeeprom.cpp
@@ -20,7 +20,7 @@
 #define MAX_TIMERS(board, version)            ((IS_ARM(board) && version >= 217) ? 3 : 2)
 #define MAX_MIXERS(board, version)            (IS_ARM(board) ? 64 : 32)
 #define MAX_CHANNELS(board, version)          (IS_ARM(board) ? 32 : 16)
-#define MAX_EXPOS(board, version)             (IS_ARM(board) ? ((IS_TARANIS(board) && version >= 216) ? 64 : 32) : (IS_DBLRAM(board, version) ? 16 : 14))
+#define MAX_EXPOS(board, version)             (IS_ARM(board) ? ((HAS_LARGE_LCD(board) && version >= 216) ? 64 : 32) : (IS_DBLRAM(board, version) ? 16 : 14))
 #define MAX_LOGICAL_SWITCHES(board, version)  (IS_ARM(board) ? (version >= 218 ? 64 : 32) : ((IS_DBLEEPROM(board, version) && version<217) ? 15 : 12))
 #define MAX_CUSTOM_FUNCTIONS(board, version)  (IS_ARM(board) ? (version >= 216 ? 64 : 32) : (IS_DBLEEPROM(board, version) ? 24 : 16))
 #define MAX_CURVES(board, version)            (IS_ARM(board) ? ((HAS_LARGE_LCD(board) && version >= 216) ? 32 : 16) : 8)
@@ -1565,7 +1565,7 @@ class CurvesField: public TransformedField {
       int * cur = &_points[0];
 
       for (int i=0; i<maxCurves; i++) {
-        CurveData *curve = &curves[i];
+        CurveData * curve = &curves[i];
         if (!IS_STM32(board) || version < 216) {
           int * next = &_points[5*(i+1) + _curves[i]];
           int size = next - cur;
@@ -1609,7 +1609,7 @@ class CurvesField: public TransformedField {
 
   protected:
     StructField internalField;
-    CurveData *curves;
+    CurveData * curves;
     BoardEnum board;
     unsigned int version;
     int maxCurves;
diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp
index 8687d626b..9cad80d49 100644
--- a/companion/src/firmwares/opentx/opentxinterface.cpp
+++ b/companion/src/firmwares/opentx/opentxinterface.cpp
@@ -791,7 +791,7 @@ int OpenTxFirmware::getCapability(Capability capability)
       return IS_TARANIS(board) ? 6 : 0;
     case LimitsPer1000:
     case EnhancedCurves:
-      return IS_TARANIS(board);
+      return IS_ARM(board);
     case HasFasOffset:
       return (IS_STOCK(board) ? false : true);
     case HasMahPersistent: