diff --git a/src/regexp.c b/src/regexp.c
index a1b080e..b020a43 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -1743,7 +1743,7 @@
     else if (enc_utf8)
     {
 	char_u *p = s1;
-	size_t n2 = 0;
+	int n2 = 0;
 	int n1 = *n;
 	// count the number of characters for byte-length of s1
 	while (n1 > 0 && *p != NUL)
@@ -1760,7 +1760,7 @@
 	n2 = p - s2;
 
 	result = MB_STRNICMP2(s1, s2, *n, n2);
-	if (result == 0 && (int)n2 < *n)
+	if (result == 0 && n2 < *n)
 	    *n = n2;
     }
     else
diff --git a/src/version.c b/src/version.c
index 76b00a9..c8527db 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    650,
+/**/
     649,
 /**/
     648,