diff --git a/src/eval.c b/src/eval.c
index da3d2bd..7250556 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2734,6 +2734,8 @@
 		    prevval = key[len];
 		    key[len] = NUL;
 		}
+		else
+		    prevval = 0; /* avoid compiler warning */
 		wrong = (lp->ll_dict->dv_scope == VAR_DEF_SCOPE
 			       && rettv->v_type == VAR_FUNC
 			       && var_check_func_name(key, lp->ll_di == NULL))
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 7e9b04c..9a89b49 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -3045,7 +3045,7 @@
 		    start_state = NFA_START_INVISIBLE_BEFORE_NEG;
 		    end_state = NFA_END_INVISIBLE_NEG;
 		    break;
-		case NFA_PREV_ATOM_LIKE_PATTERN:
+		default: /* NFA_PREV_ATOM_LIKE_PATTERN: */
 		    start_state = NFA_START_PATTERN;
 		    end_state = NFA_END_PATTERN;
 		    break;
@@ -4853,7 +4853,7 @@
     nfa_state_T *add_state;
     int		add_here;
     int		add_count;
-    int		add_off;
+    int		add_off = 0;
     int		toplevel = start->c == NFA_MOPEN;
 #ifdef NFA_REGEXP_DEBUG_LOG
     FILE	*debug = fopen(NFA_REGEXP_DEBUG_LOG, "a");
diff --git a/src/version.c b/src/version.c
index 6e419dd..3b2fc83 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1156,
+/**/
     1155,
 /**/
     1154,