diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 2d4117d444..c7e6316f00 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -3392,7 +3392,7 @@ set_one_cmd_context(xp, buff)
     /* Find start of last argument (argument just before cursor): */
     p = buff;
     xp->xp_pattern = p;
-    len = STRLEN(buff);
+    len = (int)STRLEN(buff);
     while (*p && p < buff + len)
     {
 	if (*p == ' ' || *p == TAB)
diff --git a/src/search.c b/src/search.c
index 5ee0e48a96..aa858f9eef 100644
--- a/src/search.c
+++ b/src/search.c
@@ -4621,7 +4621,8 @@ current_search(count, forward)
 	    {
 		/* searching backwards, so set pos to last line and col */
 		pos.lnum = curwin->w_buffer->b_ml.ml_line_count;
-		pos.col  = STRLEN(ml_get(curwin->w_buffer->b_ml.ml_line_count));
+		pos.col  = (colnr_T)STRLEN(
+				ml_get(curwin->w_buffer->b_ml.ml_line_count));
 	    }
 	}
 
diff --git a/src/version.c b/src/version.c
index 0be8c2b75d..b8a396dec1 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 */
+/**/
+    621,
 /**/
     620,
 /**/