diff --git a/companion/src/firmwares/boards.cpp b/companion/src/firmwares/boards.cpp
index b8b17406e..014b63cca 100644
--- a/companion/src/firmwares/boards.cpp
+++ b/companion/src/firmwares/boards.cpp
@@ -583,7 +583,7 @@ StringTagMappingTable Boards::getAnalogNamesLookupTable(Board::Type board)
 QString Boards::getAnalogInputName(Board::Type board, int index)
 {
   const StringTagMappingTable& lut = getAnalogNamesLookupTable(board);
-  if (index < lut.size())
+  if (index < (int)lut.size())
     return QString::fromStdString(lut[index].name);
 
   return CPN_STR_UNKNOWN_ITEM;
diff --git a/companion/src/firmwares/edgetx/edgetxinterface.cpp b/companion/src/firmwares/edgetx/edgetxinterface.cpp
index ca51cfa92..8c704ef92 100644
--- a/companion/src/firmwares/edgetx/edgetxinterface.cpp
+++ b/companion/src/firmwares/edgetx/edgetxinterface.cpp
@@ -67,13 +67,13 @@ bool loadModelsListFromYaml(std::vector<CategoryData>& categories,
         }
       }
     }
-    
+
   } catch (const std::runtime_error& e) {
     qDebug() << "YAML::ParserException: " << e.what();
     return false;
   }
 
-  return true;  
+  return true;
 }
 
 bool loadModelFromYaml(ModelData& model, const QByteArray& data)
@@ -116,7 +116,7 @@ bool writeModelsListToYaml(const std::vector<CategoryData>& categories,
     YAML::Node cat_attrs;
     cat_attrs["filename"] = modelFile.first;
 
-    if (modelFile.second >= categories.size()) {
+    if (modelFile.second >= (int)categories.size()) {
       return false;
     }
 
@@ -132,7 +132,7 @@ bool writeModelToYaml(const ModelData& model, QByteArray& data)
 {
   YAML::Node node;
   node = model;
-  
+
   writeYamlToByteArray(node, data);
   return true;
 }