diff --git a/src/misc1.c b/src/misc1.c
index 8029a1f54c..1519e97b31 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -445,8 +445,7 @@ get_number_indent(lnum)
 	    if (vim_regexec(&regmatch, ml_get(lnum) + lead_len, (colnr_T)0))
 	    {
 		pos.lnum = lnum;
-		pos.col  = *regmatch.endp - (ml_get(lnum) + lead_len);
-		pos.col += lead_len;
+		pos.col = (colnr_T)(*regmatch.endp - ml_get(lnum));
 #ifdef FEAT_VIRTUALEDIT
 		pos.coladd = 0;
 #endif
@@ -1354,7 +1353,8 @@ open_line(dir, flags, second_line_indent)
 	if (flags & OPENLINE_COM_LIST && second_line_indent > 0)
 	{
 	    int i;
-	    int padding = second_line_indent - (newindent + STRLEN(leader));
+	    int padding = second_line_indent
+					  - (newindent + (int)STRLEN(leader));
 
 	    /* Here whitespace is inserted after the comment char.
 	     * Below, set_indent(newindent, SIN_INSERT) will insert the
diff --git a/src/version.c b/src/version.c
index d3bb184ffd..9dcb811be1 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 */
+/**/
+    556,
 /**/
     555,
 /**/