diff --git a/Modules/zipimport.c b/Modules/zipimport.c
index 183692cc2c7..b2b2e3b9f84 100644
--- a/Modules/zipimport.c
+++ b/Modules/zipimport.c
@@ -62,7 +62,7 @@ static int
 zipimporter_init(ZipImporter *self, PyObject *args, PyObject *kwds)
 {
 	char *path, *p, *prefix, buf[MAXPATHLEN+2];
-	int len;
+	size_t len;
 
 	if (!_PyArg_NoKeywords("zipimporter()", kwds))
 		return -1;
@@ -231,7 +231,7 @@ get_subname(char *fullname)
 static int
 make_filename(char *prefix, char *name, char *path)
 {
-	int len;
+	size_t len;
 	char *p;
 
 	len = strlen(prefix);
@@ -249,7 +249,7 @@ make_filename(char *prefix, char *name, char *path)
 			*p = SEP;
 	}
 	len += strlen(name);
-	return len;
+	return (int)len;
 }
 
 enum zi_module_info {
@@ -659,7 +659,8 @@ read_directory(char *archive)
 	FILE *fp;
 	long compress, crc, data_size, file_size, file_offset, date, time;
 	long header_offset, name_size, header_size, header_position;
-	long i, l, length, count;
+	long i, l, count;
+	size_t length;
 	char path[MAXPATHLEN + 5];
 	char name[MAXPATHLEN + 5];
 	char *p, endof_central_dir[22];
diff --git a/Python/pystrtod.c b/Python/pystrtod.c
index 85eda91bfbe..3eccae89067 100644
--- a/Python/pystrtod.c
+++ b/Python/pystrtod.c
@@ -44,7 +44,7 @@ PyOS_ascii_strtod(const char *nptr, char **endptr)
 	double val = -1.0;
 	struct lconv *locale_data;
 	const char *decimal_point;
-	int decimal_point_len;
+	size_t decimal_point_len;
 	const char *p, *decimal_point_pos;
 	const char *end = NULL; /* Silence gcc */
 
@@ -165,9 +165,8 @@ PyOS_ascii_formatd(char       *buffer,
 {
 	struct lconv *locale_data;
 	const char *decimal_point;
-	int decimal_point_len;
+	size_t decimal_point_len, rest_len;
 	char *p;
-	int rest_len;
 	char format_char;
 
 /* 	g_return_val_if_fail (buffer != NULL, NULL); */