diff --git a/src/highlight.c b/src/highlight.c
index 5ce3ea107b..b22cda5870 100644
--- a/src/highlight.c
+++ b/src/highlight.c
@@ -4294,6 +4294,7 @@ highlight_changed(void)
 	    // Allow several hl_flags to be combined, like "bu" for
 	    // bold-underlined.
 	    attr = 0;
+	    id = 0;
 	    for ( ; *p && *p != ','; ++p)	    // parse up to comma
 	    {
 		if (VIM_ISWHITE(*p))		    // ignore white space
diff --git a/src/screen.c b/src/screen.c
index 316b18b207..6a062ca263 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4564,8 +4564,8 @@ draw_tabline(void)
     int		c;
     int		len;
     int		attr_sel;
-    int		attr_nosel;
-    int		attr_fill;
+    int		attr_nosel = 0;
+    int		attr_fill = 0;
     char_u	*p;
     int		room;
     int		use_sep_chars = (t_colors < 8
diff --git a/src/term.c b/src/term.c
index 026a12ecda..39f63fa954 100644
--- a/src/term.c
+++ b/src/term.c
@@ -6257,7 +6257,7 @@ check_termcode(
 	{
 	    int  mouse_index_found = -1;
 	    int keypad_index_found = -1;
-	    int keypad_slen_found;
+	    int keypad_slen_found = 0;
 
 	    for (idx = 0; idx < tc_len; ++idx)
 	    {
diff --git a/src/version.c b/src/version.c
index dd38ef7d9c..f2e546cb1a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    99,
 /**/
     98,
 /**/