diff --git a/library/include/MiscUtils.h b/library/include/MiscUtils.h
index 124987535..c9a5f66d6 100644
--- a/library/include/MiscUtils.h
+++ b/library/include/MiscUtils.h
@@ -167,8 +167,8 @@ int linear_index(const std::vector<CT*> &vec, FT CT::*field, FT key)
     return -1;
 }
 
-template <typename CT, typename FT>
-int binsearch_index(const std::vector<CT*> &vec, FT CT::*field, FT key, bool exact = true)
+template <typename CT, typename FT, typename MT>
+int binsearch_index(const std::vector<CT*> &vec, FT MT::*field, FT key, bool exact = true)
 {
     // Returns the index of the value >= the key
     int min = -1, max = (int)vec.size();
@@ -245,8 +245,8 @@ unsigned insert_into_vector(std::vector<FT> &vec, FT key, bool *inserted = NULL)
     return pos;
 }
 
-template<typename CT, typename FT>
-unsigned insert_into_vector(std::vector<CT*> &vec, FT CT::*field, CT *obj, bool *inserted = NULL)
+template<typename CT, typename FT, typename MT>
+unsigned insert_into_vector(std::vector<CT*> &vec, FT MT::*field, CT *obj, bool *inserted = NULL)
 {
     unsigned pos = (unsigned)binsearch_index(vec, field, obj->*field, false);
     bool to_ins = (pos >= vec.size() || vec[pos] != obj);
diff --git a/library/modules/Buildings.cpp b/library/modules/Buildings.cpp
index 8f0c68eb2..9d525d96b 100644
--- a/library/modules/Buildings.cpp
+++ b/library/modules/Buildings.cpp
@@ -186,7 +186,7 @@ static void zone_into_building_unidir(df::building* bld, df::building_civzonest*
             return;
     }
 
-    insert_into_vector<df::building_civzonest>(bld->relations, &df::building_civzonest::id, zone);
+    insert_into_vector(bld->relations, &df::building_civzonest::id, zone);
 }
 
 static bool is_suitable_building_for_zoning(df::building* bld)
@@ -1344,7 +1344,7 @@ static void delete_civzone_squad_links(df::building* bld)
         //if this is null, something has gone just *terribly* wrong
         if (squad)
         {
-            for (int i=0; i < squad->rooms.size(); i++)
+            for (int i=0; i < (int)squad->rooms.size(); i++)
             {
                 if (squad->rooms[i]->building_id == bld->id)
                 {