diff --git a/screen-write.c b/screen-write.c
index 07e66ca5..6286f11a 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -2137,7 +2137,7 @@ screen_write_sixelimage(struct screen_write_ctx *ctx, struct sixel_image *si,
 		for (i = 0; i < lines; i++) {
 			grid_view_scroll_region_up(gd, 0, screen_size_y(s) - 1,
 			    bg);
-			screen_write_collect_scroll(ctx);
+			screen_write_collect_scroll(ctx, bg);
 		}
 		ctx->scrolled += lines;
 		if (lines > cy)
@@ -2145,11 +2145,11 @@ screen_write_sixelimage(struct screen_write_ctx *ctx, struct sixel_image *si,
 		else
 			screen_write_cursormove(ctx, -1, cy - lines, 0);
 	}
-	screen_write_collect_flush(ctx, 0);
+	screen_write_collect_flush(ctx, 0, __func__);
 
 	image_store(s, si);
 
-	screen_write_initctx(ctx, &ttyctx);
+	screen_write_initctx(ctx, &ttyctx, 0);
 	ttyctx.ptr = si;
 
 	tty_write(tty_cmd_sixelimage, &ttyctx);
diff --git a/sixel.c b/sixel.c
index 68ca9a5d..a8cd5134 100644
--- a/sixel.c
+++ b/sixel.c
@@ -547,7 +547,7 @@ sixel_to_screen(struct sixel_image *si)
 	gc.attr |= (GRID_ATTR_CHARSET|GRID_ATTR_DIM);
 	utf8_set(&gc.data, '~');
 
-	screen_write_start(&ctx, NULL, s);
+	screen_write_start(&ctx, s);
 	if (sx == 1 || sy == 1) {
 		for (y = 0; y < sy; y++) {
 			for (x = 0; x < sx; x++)
diff --git a/tty.c b/tty.c
index eb613b08..6b2d917e 100644
--- a/tty.c
+++ b/tty.c
@@ -1500,6 +1500,7 @@ tty_draw_line(struct tty *tty, struct screen *s, u_int px, u_int py, u_int nx,
 void
 tty_draw_images(struct tty *tty, struct window_pane *wp, struct screen *s)
 {
+#if 0 /* XXX */
 	struct client	*c = tty->client;
 	struct image	*im;
 	struct tty_ctx	 ttyctx;
@@ -1507,8 +1508,6 @@ tty_draw_images(struct tty *tty, struct window_pane *wp, struct screen *s)
 	TAILQ_FOREACH(im, &s->images, entry) {
 		memset(&ttyctx, 0, sizeof ttyctx);
 
-		ttyctx.wp = wp;
-
 		ttyctx.ocx = im->px;
 		ttyctx.ocy = im->py;
 
@@ -1527,8 +1526,10 @@ tty_draw_images(struct tty *tty, struct window_pane *wp, struct screen *s)
 		ttyctx.ptr = im->data;
 		tty_cmd_sixelimage(tty, &ttyctx);
 	}
+#endif
 }
 
+void
 tty_sync_start(struct tty *tty)
 {
 	if (tty->flags & TTY_BLOCK)
@@ -2072,25 +2073,20 @@ tty_cmd_rawstring(struct tty *tty, const struct tty_ctx *ctx)
 void
 tty_cmd_sixelimage(struct tty *tty, const struct tty_ctx *ctx)
 {
-	struct window_pane	*wp = ctx->wp;
 	struct sixel_image	*si = ctx->ptr;
 	struct sixel_image	*new;
-	int			 flags = (tty->term->flags|tty->term_flags);
 	char			*data;
 	size_t			 size;
 	u_int			 cx = ctx->ocx, cy = ctx->ocy, sx, sy;
 	u_int			 i, j, x, y, rx, ry;
 
-	if ((~flags & TERM_SIXEL) && !tty_term_has(tty->term, TTYC_SXL))
+	if ((~tty->term->flags & TERM_SIXEL) &&
+        !tty_term_has(tty->term, TTYC_SXL))
 		return;
 	if (tty->xpixel == 0 || tty->ypixel == 0)
 		return;
 
 	sixel_size_in_cells(si, &sx, &sy);
-	if (sx > wp->sx - cx)
-		sx = wp->sx - cx;
-	if (sy > wp->sy - cy)
-		sy = wp->sy - cy;
 	log_debug("%s: image is %ux%u", __func__, sx, sy);
 	if (!tty_clamp_area(tty, ctx, cx, cy, sx, sy, &i, &j, &x, &y, &rx, &ry))
 		return;
@@ -2115,7 +2111,7 @@ tty_cmd_sixelimage(struct tty *tty, const struct tty_ctx *ctx)
 	sixel_free(new);
 }
 
-static void
+void
 tty_cmd_syncstart(struct tty *tty, const struct tty_ctx *ctx)
 {
 	if (ctx->num == 0x11) {
@@ -2134,7 +2130,7 @@ tty_cmd_syncstart(struct tty *tty, const struct tty_ctx *ctx)
 	}
 }
 
-static void
+void
 tty_cell(struct tty *tty, const struct grid_cell *gc,
     const struct grid_cell *defaults, struct colour_palette *palette)
 {