diff --git a/src/misc1.c b/src/misc1.c
index 5d1cba7..5003ae5 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -5468,7 +5468,7 @@
 
 	for (i = 0; i < (int)(sizeof(skip) / sizeof(char *)); ++i)
 	{
-	    l = strlen(skip[i]);
+	    l = (int)strlen(skip[i]);
 	    if (cin_starts_with(s, skip[i]))
 	    {
 		s = cin_skipcomment(s + l);
@@ -6430,7 +6430,7 @@
     char_u *s;
     char *word;
 {
-    int l = STRLEN(word);
+    int l = (int)STRLEN(word);
 
     return (STRNCMP(s, word, l) == 0 && !vim_isIDc(s[l]));
 }
diff --git a/src/version.c b/src/version.c
index 7c1e274..504ba7f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    855,
+/**/
     854,
 /**/
     853,