diff --git a/src/channel.c b/src/channel.c
index 9ba013a..939b513 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -2657,9 +2657,11 @@
 		msg = json_encode(listtv, ch_mode);
 	    if (msg != NULL)
 	    {
+#ifdef FEAT_TERMINAL
 		if (buffer->b_term != NULL)
 		    write_to_term(buffer, msg, channel);
 		else
+#endif
 		    append_to_buffer(buffer, msg, channel, part);
 	    }
 	}
diff --git a/src/screen.c b/src/screen.c
index 944eecd..0ec9ea2 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -183,6 +183,12 @@
 # define SYN_TIME_LIMIT 1
 #endif
 
+#ifdef FEAT_RIGHTLEFT
+# define HAS_RIGHTLEFT(x) x
+#else
+# define HAS_RIGHTLEFT(x) FALSE
+#endif
+
 /*
  * Redraw the current window later, with update_screen(type).
  * Set must_redraw only if not already set to a higher value.
@@ -4001,7 +4007,7 @@
 		)
 	{
 	    screen_line(screen_row, W_WINCOL(wp), col, -(int)W_WIDTH(wp),
-								  wp->w_p_rl);
+						    HAS_RIGHTLEFT(wp->w_p_rl));
 	    /* Pretend we have finished updating the window.  Except when
 	     * 'cursorcolumn' is set. */
 #ifdef FEAT_SYN_HL
@@ -5448,7 +5454,7 @@
 #endif
 
 	    screen_line(screen_row, W_WINCOL(wp), col,
-						(int)W_WIDTH(wp), wp->w_p_rl);
+				  (int)W_WIDTH(wp), HAS_RIGHTLEFT(wp->w_p_rl));
 	    row++;
 
 	    /*
@@ -5754,11 +5760,11 @@
 	{
 #ifdef FEAT_CONCEAL
 	    screen_line(screen_row, W_WINCOL(wp), col - boguscols,
-						(int)W_WIDTH(wp), wp->w_p_rl);
+				  (int)W_WIDTH(wp), HAS_RIGHTLEFT(wp->w_p_rl));
 	    boguscols = 0;
 #else
 	    screen_line(screen_row, W_WINCOL(wp), col,
-						(int)W_WIDTH(wp), wp->w_p_rl);
+				  (int)W_WIDTH(wp), HAS_RIGHTLEFT(wp->w_p_rl));
 #endif
 	    ++row;
 	    ++screen_row;
diff --git a/src/version.c b/src/version.c
index d23c0e1..bd274f7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    719,
+/**/
     718,
 /**/
     717,