diff --git a/src/disaster_cmd.cpp b/src/disaster_cmd.cpp
index 725cd914c7..41b25dcb4d 100644
--- a/src/disaster_cmd.cpp
+++ b/src/disaster_cmd.cpp
@@ -880,9 +880,9 @@ static void DoDisaster()
 {
 	byte buf[lengthof(_disasters)];
 
-	size_t j = 0;
+	byte j = 0;
 	for (size_t i = 0; i != lengthof(_disasters); i++) {
-		if (_cur_year >= _disasters[i].min_year && _cur_year < _disasters[i].max_year) buf[j++] = i;
+		if (_cur_year >= _disasters[i].min_year && _cur_year < _disasters[i].max_year) buf[j++] = (byte)i;
 	}
 
 	if (j == 0) return;
diff --git a/src/namegen.cpp b/src/namegen.cpp
index 68fc86a24c..b48ce19d8e 100644
--- a/src/namegen.cpp
+++ b/src/namegen.cpp
@@ -559,7 +559,7 @@ static char *MakeCzechTownName(char *buf, const char *last, uint32 seed)
 		assert(i > 0);
 
 		/* Load the ending */
-		ending = map[SeedModChance(16, i, seed)];
+		ending = map[SeedModChance(16, (int)i, seed)];
 		/* Override possible CZG_*FREE; this must be a real gender,
 		 * otherwise we get overflow when modifying the adjectivum. */
 		gender = _name_czech_subst_ending[ending].gender;