diff --git a/src/if_py_both.h b/src/if_py_both.h
index e0fd3eafb0..d09b14c756 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -358,7 +358,9 @@ static PyObject *py_find_spec;
 #else
 static PyObject *py_load_module;
 #endif
+#if PY_VERSION_HEX < 0x30c00a7
 static PyObject *py_find_module;
+#endif
 
 static PyObject *VimError;
 
diff --git a/src/insexpand.c b/src/insexpand.c
index 2a5f8e8045..00a7b75684 100644
--- a/src/insexpand.c
+++ b/src/insexpand.c
@@ -3544,7 +3544,7 @@ get_next_filename_completion(void)
     int		i;
     int		score;
     char_u	*leader = ins_compl_leader();
-    int		leader_len = STRLEN(leader);
+    size_t	leader_len = STRLEN(leader);
     int		in_fuzzy = ((get_cot_flags() & COT_FUZZY) != 0 && leader_len > 0);
     char_u	**sorted_matches;
     int		*fuzzy_indices_data;
diff --git a/src/search.c b/src/search.c
index c8f8736768..01c143f69b 100644
--- a/src/search.c
+++ b/src/search.c
@@ -5265,7 +5265,7 @@ search_for_fuzzy_match(
 		    {
 			found_new_match = TRUE;
 			*pos = current_pos;
-			*len = STRLEN(*ptr);
+			*len = (int)STRLEN(*ptr);
 			break;
 		    }
 		}
diff --git a/src/version.c b/src/version.c
index 31b0c2462f..398b4821ad 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    632,
 /**/
     631,
 /**/