diff --git a/src/getchar.c b/src/getchar.c
index 05693727f6..fb28160e54 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -3922,7 +3922,7 @@ showmap(mp, local)
     if (mapchars != NULL)
     {
 	msg_puts(mapchars);
-	len = STRLEN(mapchars);
+	len = (int)STRLEN(mapchars);
 	vim_free(mapchars);
     }
 
diff --git a/src/if_py_both.h b/src/if_py_both.h
index 4b7f185cfa..e435e3e5c0 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -154,7 +154,7 @@ writer(writefn fn, char_u *str, PyInt n)
     {
 	PyInt len = ptr - str;
 
-	if (ga_grow(&io_ga, len + 1) == FAIL)
+	if (ga_grow(&io_ga, (int)(len + 1)) == FAIL)
 	    break;
 
 	mch_memmove(((char *)io_ga.ga_data) + io_ga.ga_len, str, (size_t)len);
@@ -166,10 +166,10 @@ writer(writefn fn, char_u *str, PyInt n)
     }
 
     /* Put the remaining text into io_ga for later printing. */
-    if (n > 0 && ga_grow(&io_ga, n + 1) == OK)
+    if (n > 0 && ga_grow(&io_ga, (int)(n + 1)) == OK)
     {
 	mch_memmove(((char *)io_ga.ga_data) + io_ga.ga_len, str, (size_t)n);
-	io_ga.ga_len += n;
+	io_ga.ga_len += (int)n;
     }
 }
 
diff --git a/src/os_win32.c b/src/os_win32.c
index 3fdd41b6db..0ca47d0fea 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -224,7 +224,8 @@ get_exe_name(void)
 
     if (exe_path == NULL && exe_name != NULL)
     {
-	exe_path = vim_strnsave(exe_name, gettail_sep(exe_name) - exe_name);
+	exe_path = vim_strnsave(exe_name,
+				     (int)(gettail_sep(exe_name) - exe_name));
 	if (exe_path != NULL)
 	{
 	    /* Append our starting directory to $PATH, so that when doing
@@ -2374,7 +2375,7 @@ fname_case(
 	/* To avoid a slow failure append "\*" when searching a directory,
 	 * server or network share. */
 	STRCPY(szTrueNameTemp, szTrueName);
-	slen = strlen(szTrueNameTemp);
+	slen = (int)strlen(szTrueNameTemp);
 	if (*porig == psepc && slen + 2 < _MAX_PATH)
 	    STRCPY(szTrueNameTemp + slen, "\\*");
 
diff --git a/src/version.c b/src/version.c
index a49cd52fc9..ed599f7663 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    37,
 /**/
     36,
 /**/