diff --git a/src/screen.c b/src/screen.c
index 28565fa..70c7ff1 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -2337,7 +2337,7 @@
 		    else
 			len = W_WIDTH(wp) - txtcol;
 		    RL_MEMSET(wp->w_old_cursor_fcol + txtcol, hl_attr(HLF_V),
-						 len - wp->w_old_cursor_fcol);
+					    len - (int)wp->w_old_cursor_fcol);
 		}
 	    }
 	    else
@@ -3591,6 +3591,9 @@
 		 * @Spell cluster. */
 		if (has_spell && v >= word_end)
 		{
+		    spell_attr = 0;
+		    if (area_attr == 0 && search_attr == 0)
+			char_attr = syntax_attr;
 		    if (!has_syntax || can_spell)
 		    {
 			char_u	*prev_ptr = ptr - (
@@ -3599,7 +3602,6 @@
 # endif
 									    1);
 
-			spell_attr = 0;
 			iswordc = spell_iswordc(prev_ptr);
 			if (iswordc && !prev_iswordc)
 			{
@@ -3620,8 +3622,6 @@
 			}
 			prev_iswordc = iswordc;
 		    }
-		    else
-			spell_attr = 0;
 		}
 		if (spell_attr != 0)
 		    char_attr = hl_combine_attr(char_attr, spell_attr);