diff --git a/source/config.c b/source/config.c
index aac2d9e..58262da 100644
--- a/source/config.c
+++ b/source/config.c
@@ -284,11 +284,9 @@ void configMenu(bool oldPinStatus, u32 oldPinMode)
         u32 pressed;
         do
         {
-            pressed = waitInput(true);
+            pressed = waitInput(true) & MENU_BUTTONS;
         }
-        while(!(pressed & MENU_BUTTONS));
-
-        pressed &= MENU_BUTTONS;
+        while(!pressed);
 
         if(pressed == BUTTON_START) break;
 
diff --git a/source/fs.c b/source/fs.c
index d762ea5..f765042 100644
--- a/source/fs.c
+++ b/source/fs.c
@@ -204,11 +204,9 @@ bool payloadMenu(char *path)
         {
             do
             {
-                pressed = waitInput(true);
+                pressed = waitInput(true) & MENU_BUTTONS;
             }
-            while(!(pressed & MENU_BUTTONS));
-
-            pressed &= MENU_BUTTONS;
+            while(!pressed);
 
             u32 oldSelectedPayload = selectedPayload;
 
diff --git a/sysmodules/rosalina/source/draw.c b/sysmodules/rosalina/source/draw.c
index c144c1d..f3f770a 100644
--- a/sysmodules/rosalina/source/draw.c
+++ b/sysmodules/rosalina/source/draw.c
@@ -250,9 +250,9 @@ static inline void Draw_ConvertPixelToBGR8(u8 *dst, const u8 *src, GSPGPU_Frameb
             green = (px >> 8) & 0xF;
             red = (px >> 12) & 0xF;
 
-            dst[0] = (blue  << 4) | (blue  >> 4);
-            dst[1] = (green << 4) | (green >> 4);
-            dst[2] = (red   << 4) | (red   >> 4);
+            dst[0] = (blue  << 4) | (blue  >> 0);
+            dst[1] = (green << 4) | (green >> 0);
+            dst[2] = (red   << 4) | (red   >> 0);
 
             break;
         }