diff --git a/src/userfunc.c b/src/userfunc.c
index 0fca23a..70a3c51 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -4194,7 +4194,7 @@
 	    // In Vim9 script a function cannot have the same name as a
 	    // variable.
 	    if (vim9script && *arg == K_SPECIAL
-		     && eval_variable(name_base, STRLEN(name_base), NULL, NULL,
+		&& eval_variable(name_base, (int)STRLEN(name_base), NULL, NULL,
 			 EVAL_VAR_NOAUTOLOAD + EVAL_VAR_IMPORT
 						     + EVAL_VAR_NO_FUNC) == OK)
 	    {
diff --git a/src/version.c b/src/version.c
index 7029134..1b83685 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3816,
+/**/
     3815,
 /**/
     3814,