diff --git a/modules/access/screen/xcb.c b/modules/access/screen/xcb.c
index e66f6a3ab9187d94360c652046b96a8e82301221..f64f8d0d856d5ac1f3a544ca9b42e90101a41699 100644
--- a/modules/access/screen/xcb.c
+++ b/modules/access/screen/xcb.c
@@ -157,7 +157,7 @@ static int Open (vlc_object_t *obj)
         unsigned long ul = strtoul (demux->psz_path, &end, 0);
         if (*end || ul > 0xffffffff)
         {
-            msg_Err (obj, "bad X11 window %s", demux->psz_path);
+            msg_Err (obj, "bad X11 drawable %s", demux->psz_path);
             goto error;
         }
         p_sys->window = ul;
@@ -186,14 +186,15 @@ static int Open (vlc_object_t *obj)
         p_sys->h = geo->height - p_sys->y;
 
     uint32_t chroma = 0;
-    uint8_t bpp = geo->depth;
+    uint8_t bpp;
     for (const xcb_format_t *fmt = xcb_setup_pixmap_formats (setup),
              *end = fmt + xcb_setup_pixmap_formats_length (setup);
          fmt < end; fmt++)
     {
         if (fmt->depth != geo->depth)
             continue;
-        switch (geo->depth)
+        bpp = fmt->depth;
+        switch (fmt->depth)
         {
             case 32:
                 if (fmt->bits_per_pixel == 32)