diff --git a/src/ex_getln.c b/src/ex_getln.c
index 3d0c26f05e..a3a9c7b91a 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -5263,7 +5263,7 @@ get_history_arg(xp, idx)
 {
     static char_u compl[2] = { NUL, NUL };
     char *short_names = ":=@>?/";
-    int short_names_count = STRLEN(short_names);
+    int short_names_count = (int)STRLEN(short_names);
     int history_name_count = sizeof(history_names) / sizeof(char *) - 1;
 
     if (idx < short_names_count)
diff --git a/src/version.c b/src/version.c
index 6878ef2a1d..50c3d03d4e 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 */
+/**/
+    525,
 /**/
     524,
 /**/