diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index d8df13c..b16ba56 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -3739,7 +3739,7 @@
     if (depth > 10)
 	return FALSE;
 
-    for (;;)
+    while (state != NULL)
     {
 	switch (state->c)
 	{
@@ -3765,7 +3765,7 @@
 	    case NFA_COMPOSING:
 		/* skip ahead to next state */
 		state = state->out1->out;
-		break;
+		continue;
 
 	    case NFA_ANY:
 	    case NFA_IDENT:
diff --git a/src/ui.c b/src/ui.c
index 577b742..18021c2 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -1467,8 +1467,9 @@
     else
 # endif
 	return clip_x11_owner_exists(cbd);
-#endif
+#else
     return TRUE;
+#endif
 }
 
 #endif /* FEAT_CLIPBOARD */
diff --git a/src/version.c b/src/version.c
index 67230f5..1744af4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    18,
+/**/
     17,
 /**/
     16,