diff --git a/gfx/common/vulkan_common.c b/gfx/common/vulkan_common.c
index e448e23661..6a487f4364 100644
--- a/gfx/common/vulkan_common.c
+++ b/gfx/common/vulkan_common.c
@@ -193,8 +193,8 @@ static void vulkan_emulated_mailbox_loop(void *userdata)
    for (;;)
    {
       slock_lock(mailbox->lock);
-      while (  !(mailbox->flags & VK_MAILBOX_FLAG_DEAD) 
-		      && !(mailbox->flags & VK_MAILBOX_FLAG_REQUEST_ACQUIRE))
+      while (   !(mailbox->flags & VK_MAILBOX_FLAG_DEAD) 
+             && !(mailbox->flags & VK_MAILBOX_FLAG_REQUEST_ACQUIRE))
          scond_wait(mailbox->cond, mailbox->lock);
 
       if (mailbox->flags & VK_MAILBOX_FLAG_DEAD)
@@ -2905,7 +2905,7 @@ bool vulkan_create_swapchain(gfx_ctx_vulkan_data_t *vk,
       vulkan_create_wait_fences(vk);
 
       if (     (vk->flags & VK_DATA_FLAG_EMULATING_MAILBOX)
-            && vk->mailbox.swapchain == VK_NULL_HANDLE)
+            && (vk->mailbox.swapchain == VK_NULL_HANDLE))
       {
          vulkan_emulated_mailbox_init(
                &vk->mailbox, vk->context.device, vk->swapchain);
@@ -2920,7 +2920,7 @@ bool vulkan_create_swapchain(gfx_ctx_vulkan_data_t *vk,
          /* We are tearing down, and entering a state 
           * where we are supposed to have
           * acquired an image, so block until we have acquired. */
-         if (!(vk->context.flags & VK_CTX_FLAG_HAS_ACQUIRED_SWAPCHAIN))
+         if (! (vk->context.flags & VK_CTX_FLAG_HAS_ACQUIRED_SWAPCHAIN))
             if (vk->mailbox.swapchain != VK_NULL_HANDLE)
                res = vulkan_emulated_mailbox_acquire_next_image_blocking(
                      &vk->mailbox,
diff --git a/network/netplay/netplay_frontend.c b/network/netplay/netplay_frontend.c
index cefe295d85..37f7e2aa16 100644
--- a/network/netplay/netplay_frontend.c
+++ b/network/netplay/netplay_frontend.c
@@ -3690,7 +3690,7 @@ static void netplay_sync_post_frame(netplay_t *netplay, bool stalled)
       if (netplay->catch_up)
       {
          netplay->catch_up             = false;
-	 input_state_get_ptr()->flags &= ~INP_FLAG_NONBLOCKING;
+         input_state_get_ptr()->flags &= ~INP_FLAG_NONBLOCKING;
          driver_set_nonblock_state();
       }
       return;
@@ -4008,8 +4008,7 @@ static void remote_unpaused(netplay_t *netplay,
     for (i = 0; i < netplay->connections_size; i++)
     {
        struct netplay_connection *sc = &netplay->connections[i];
-       if (   (sc->flags & NETPLAY_CONN_FLAG_ACTIVE)
-           && (sc->flags & NETPLAY_CONN_FLAG_PAUSED))
+       if (sc->flags & (NETPLAY_CONN_FLAG_ACTIVE | NETPLAY_CONN_FLAG_PAUSED))
        {
           netplay->remote_paused = true;
           break;
@@ -7134,8 +7133,8 @@ static void netplay_frontend_paused(netplay_t *netplay, bool paused)
    for (i = 0; i < netplay->connections_size; i++)
    {
       struct netplay_connection *connection = &netplay->connections[i];
-      if (     (connection->flags & NETPLAY_CONN_FLAG_ACTIVE) 
-            && (connection->flags & NETPLAY_CONN_FLAG_PAUSED))
+      if (connection->flags & 
+            (NETPLAY_CONN_FLAG_ACTIVE | NETPLAY_CONN_FLAG_PAUSED))
          paused_ct++;
    }