diff --git a/plugins/embark-assistant/finder_ui.cpp b/plugins/embark-assistant/finder_ui.cpp
index 000c73989..5410b82a5 100644
--- a/plugins/embark-assistant/finder_ui.cpp
+++ b/plugins/embark-assistant/finder_ui.cpp
@@ -1299,7 +1299,7 @@ namespace embark_assist {
 
                 case fields::neighbors:
                     for (uint8_t k = 0; k < state->civs.size(); k++) {
-                        state->finder_list.push_back({ state->civs[k].description, static_cast<int8_t>(i) + (int8_t)k });
+                        state->finder_list.push_back({ state->civs[k].description, (int16_t)(static_cast<int8_t>(i) + k) });
                     }
                     break;
                 }
diff --git a/plugins/embark-assistant/matcher.cpp b/plugins/embark-assistant/matcher.cpp
index 7732feb93..7575b1287 100644
--- a/plugins/embark-assistant/matcher.cpp
+++ b/plugins/embark-assistant/matcher.cpp
@@ -3022,7 +3022,7 @@ uint16_t embark_assist::matcher::find(embark_assist::defs::match_iterators *iter
             int16_t present_count = 0;
             int16_t absent_count = 0;
 
-            for (int16_t i = 0; i < iterator->finder.neighbors.size(); i++) {
+            for (size_t i = 0; i < iterator->finder.neighbors.size(); i++) {
                 switch (iterator->finder.neighbors[i].present) {
                 case embark_assist::defs::present_absent_ranges::NA:
                     break;