diff --git a/src/edit.c b/src/edit.c
index c911702..25d4b58 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -2632,7 +2632,7 @@
 #ifdef FEAT_WINDOWS
 	if (buf == curbuf)	/* first call for this flag/expansion */
 	    wp = curwin;
-	while ((wp = wp->w_next != NULL ? wp->w_next : firstwin) != curwin
+	while ((wp = (wp->w_next != NULL ? wp->w_next : firstwin)) != curwin
 		&& wp->w_buffer->b_scanned)
 	    ;
 	buf = wp->w_buffer;
@@ -2644,7 +2644,7 @@
 	/* 'b' (just loaded buffers), 'u' (just non-loaded buffers) or 'U'
 	 * (unlisted buffers)
 	 * When completing whole lines skip unloaded buffers. */
-	while ((buf = buf->b_next != NULL ? buf->b_next : firstbuf) != curbuf
+	while ((buf = (buf->b_next != NULL ? buf->b_next : firstbuf)) != curbuf
 		&& ((flag == 'U'
 			? buf->b_p_bl
 			: (!buf->b_p_bl
diff --git a/src/proto/spell.pro b/src/proto/spell.pro
index 91483b0..91fcf72 100644
--- a/src/proto/spell.pro
+++ b/src/proto/spell.pro
@@ -8,7 +8,7 @@
 void put_bytes __ARGS((FILE *fd, long_u nr, int len));
 void ex_mkspell __ARGS((exarg_T *eap));
 void ex_spell __ARGS((exarg_T *eap));
-void spell_add_word __ARGS((char_u *word, int len, int bad));
+void spell_add_word __ARGS((char_u *word, int len, int bad, int temp));
 void init_spell_chartab __ARGS((void));
 int spell_check_sps __ARGS((void));
 void spell_suggest __ARGS((void));
diff --git a/src/syntax.c b/src/syntax.c
index 313f600..7a94df7 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -1182,7 +1182,7 @@
     prev = NULL;
     for (p = buf->b_sst_first; p != NULL; )
     {
-	if (p->sst_lnum + syn_buf->b_syn_sync_linebreaks > buf->b_mod_top)
+	if (p->sst_lnum + buf->b_syn_sync_linebreaks > buf->b_mod_top)
 	{
 	    n = p->sst_lnum + buf->b_mod_xlines;
 	    if (n <= buf->b_mod_bot)