diff --git a/src/strings.c b/src/strings.c
index 7a99cd9642..0313e7480e 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -898,6 +898,7 @@ string_filter_map(
 	    break;
 	len = (int)STRLEN(tv.vval.v_string);
 
+	newtv.v_type = VAR_UNKNOWN;
 	set_vim_var_nr(VV_KEY, idx);
 	if (filter_map_one(&tv, expr, filtermap, &newtv, &rem) == FAIL
 		|| did_emsg)
diff --git a/src/version.c b/src/version.c
index e3aa288af9..30f420bdd3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4878,
 /**/
     4877,
 /**/