diff --git a/src/if_py_both.h b/src/if_py_both.h
index 8229458d88..0912ee06df 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -495,7 +495,7 @@ VimStrwidth(PyObject *self UNUSED, PyObject *args)
     if (!PyArg_ParseTuple(args, "s", &expr))
 	return NULL;
 
-    return PyLong_FromLong(mb_string2cells((char_u *)expr, STRLEN(expr)));
+    return PyLong_FromLong(mb_string2cells((char_u *)expr, (int)STRLEN(expr)));
 }
 
 /*
diff --git a/src/version.c b/src/version.c
index 074ce3e53d..29943e36e4 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 */
+/**/
+    580,
 /**/
     579,
 /**/