diff --git a/src/screen.c b/src/screen.c
index 6a9f632487..6855bba575 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4787,8 +4787,8 @@ set_chars_option(win_T *wp, char_u **varp)
     int		round, i, len, entries;
     char_u	*p, *s;
     int		c1 = 0, c2 = 0, c3 = 0;
-    char_u	*last_multispace;	// Last occurrence of "multispace:"
-    int		multispace_len = 0;	// Length of lcs-multispace string
+    char_u	*last_multispace = NULL; // Last occurrence of "multispace:"
+    int		multispace_len = 0;	 // Length of lcs-multispace string
     struct charstab
     {
 	int	*cp;
diff --git a/src/version.c b/src/version.c
index 75d083e9de..05331a6869 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3425,
 /**/
     3424,
 /**/