diff --git a/libretro-common/formats/bmp/rbmp_encode.c b/libretro-common/formats/bmp/rbmp_encode.c
index fba423d355..b094d82646 100644
--- a/libretro-common/formats/bmp/rbmp_encode.c
+++ b/libretro-common/formats/bmp/rbmp_encode.c
@@ -142,7 +142,7 @@ static void dump_content(RFILE *file, const void *frame,
 {
    uint8_t *line;
    size_t line_size;
-   int i, j;
+   int j;
    int bytes_per_pixel = (type==RBMP_SOURCE_TYPE_ARGB8888?4:3);
    union
    {
diff --git a/screenshot.c b/screenshot.c
index 6b157ea585..87e4173c37 100644
--- a/screenshot.c
+++ b/screenshot.c
@@ -129,7 +129,7 @@ static bool screenshot_dump(const char *folder, const void *frame,
    if (bgr24)
       bmp_type = RBMP_SOURCE_TYPE_BGR24;
    else if (video_driver_get_pixel_format() == RETRO_PIXEL_FORMAT_XRGB8888)
-      bmp_type = RBMP_SOURCE_TYPE_XRGB8888;
+      bmp_type = RBMP_SOURCE_TYPE_XRGB888;
 
    ret = rbmp_save_image(filename,
          frame,