diff --git a/src/syntax.c b/src/syntax.c
index d09359ab1..e945dac04 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -10044,11 +10044,11 @@ highlight_changed(void)
 #ifdef USER_HIGHLIGHT
     char_u      userhl[10];
 # ifdef FEAT_STL_OPT
-    int		id_SNC = -1;
     int		id_S = -1;
+    int		id_SNC = 0;
 #  ifdef FEAT_TERMINAL
-    int		id_ST = -1;
-    int		id_STNC = -1;
+    int		id_ST = 0;
+    int		id_STNC = 0;
 #  endif
     int		hlcnt;
 # endif
diff --git a/src/version.c b/src/version.c
index acc535e5c..339ac9074 100644
--- a/src/version.c
+++ b/src/version.c
@@ -766,6 +766,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1621,
 /**/
     1620,
 /**/