diff --git a/src/getchar.c b/src/getchar.c
index cc93a7dd81..cafa660c43 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -4530,7 +4530,7 @@ check_abbr(c, ptr, col, mincol)
 	    if (q != NULL)
 	    {
 		vim_unescape_csi(q);
-		qlen = STRLEN(q);
+		qlen = (int)STRLEN(q);
 		vim_free(q);
 	    }
 	}
diff --git a/src/version.c b/src/version.c
index 7d1a1914b6..e0efbb6c35 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    484,
 /**/
     483,
 /**/