diff --git a/common/canvas_base.c b/common/canvas_base.c
index 2c85886a..e13a005b 100644
--- a/common/canvas_base.c
+++ b/common/canvas_base.c
@@ -2422,6 +2422,7 @@ static void stroke_fill_spans(lineGC * pGC,
                 r.x1 = points[i].x;
                 r.y1 = points[i].y;
                 r.x2 = points[i].x + widths[i];
+                r.y2 = r.y1 + 1;
                 canvas->ops->fill_solid_rects_rop(canvas, &r, 1,
                                                   strokeGC->color, rop);
             }
@@ -2433,6 +2434,7 @@ static void stroke_fill_spans(lineGC * pGC,
                 r.x1 = points[i].x;
                 r.y1 = points[i].y;
                 r.x2 = points[i].x + widths[i];
+                r.y2 = r.y1 + 1;
                 canvas->ops->fill_tiled_rects(canvas, &r, 1,
                                               strokeGC->tile,
                                               strokeGC->tile_offset_x,
@@ -2444,6 +2446,7 @@ static void stroke_fill_spans(lineGC * pGC,
                 r.x1 = points[i].x;
                 r.y1 = points[i].y;
                 r.x2 = points[i].x + widths[i];
+                r.y2 = r.y1 + 1;
                 canvas->ops->fill_tiled_rects_rop(canvas, &r, 1,
                                                   strokeGC->tile,
                                                   strokeGC->tile_offset_x,
diff --git a/server/red_worker.c b/server/red_worker.c
index ae361c1d..d4f9743e 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -5949,10 +5949,15 @@ static void fill_bits(DisplayChannel *display_channel, QXLPHYSICAL *in_bitmap, D
     int memslot_id;
     compress_send_data_t comp_send_data;
 
-    ASSERT(*in_bitmap);
+    if (*in_bitmap == 0) {
+        ASSERT(drawable->self_bitmap);
+        qxl_image = (QXLImage *)drawable->self_bitmap;
+    } else {
+        qxl_image = (QXLImage *)get_virt(worker, *in_bitmap, sizeof(QXLImage),
+                                         drawable->group_id);
+    }
 
     image = alloc_image(display_channel);
-    qxl_image = (QXLImage *)get_virt(worker, *in_bitmap, sizeof(QXLImage), drawable->group_id);
 
     image->descriptor.id = qxl_image->descriptor.id;
     image->descriptor.type = qxl_image->descriptor.type;