diff --git a/network/netplay/netplay_frontend.c b/network/netplay/netplay_frontend.c
index 3a11db30a1..408443883b 100644
--- a/network/netplay/netplay_frontend.c
+++ b/network/netplay/netplay_frontend.c
@@ -4009,8 +4009,8 @@ static void remote_unpaused(netplay_t *netplay,
     {
        struct netplay_connection *sc = &netplay->connections[i];
        if (sc->flags &  
-                 (NETPLAY_CONN_FLAG_ACTIVE | NETPLAY_CONN_FLAG_PAUSED)
-             ==  (NETPLAY_CONN_FLAG_ACTIVE | NETPLAY_CONN_FLAG_PAUSED))
+                 ((NETPLAY_CONN_FLAG_ACTIVE | NETPLAY_CONN_FLAG_PAUSED)
+             ==   (NETPLAY_CONN_FLAG_ACTIVE | NETPLAY_CONN_FLAG_PAUSED)))
        {
           netplay->remote_paused = true;
           break;
@@ -7136,8 +7136,8 @@ static void netplay_frontend_paused(netplay_t *netplay, bool paused)
    {
       struct netplay_connection *connection = &netplay->connections[i];
       if (connection->flags &  
-                (NETPLAY_CONN_FLAG_ACTIVE | NETPLAY_CONN_FLAG_PAUSED)
-            ==  (NETPLAY_CONN_FLAG_ACTIVE | NETPLAY_CONN_FLAG_PAUSED))
+                ((NETPLAY_CONN_FLAG_ACTIVE | NETPLAY_CONN_FLAG_PAUSED)
+            ==  (NETPLAY_CONN_FLAG_ACTIVE | NETPLAY_CONN_FLAG_PAUSED)))
          paused_ct++;
    }
 
diff --git a/retroarch.c b/retroarch.c
index 6d944f8cd1..1b04cf1088 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -3474,16 +3474,16 @@ void retroarch_override_setting_set(
          break;
 #ifdef HAVE_NETWORKING
      case RARCH_OVERRIDE_SETTING_NETPLAY_MODE:
-         net_st->has_set_netplay_mode = true;
+         net_st->flags |= NET_DRIVER_ST_FLAG_HAS_SET_NETPLAY_MODE;
          break;
       case RARCH_OVERRIDE_SETTING_NETPLAY_IP_ADDRESS:
-         net_st->has_set_netplay_ip_address = true;
+         net_st->flags |= NET_DRIVER_ST_FLAG_HAS_SET_NETPLAY_IP_ADDRESS;
          break;
       case RARCH_OVERRIDE_SETTING_NETPLAY_IP_PORT:
-         net_st->has_set_netplay_ip_port = true;
+         net_st->flags |= NET_DRIVER_ST_FLAG_HAS_SET_NETPLAY_IP_PORT;
          break;
       case RARCH_OVERRIDE_SETTING_NETPLAY_CHECK_FRAMES:
-         net_st->has_set_netplay_check_frames = true;
+         net_st->flags |= NET_DRIVER_ST_FLAG_HAS_SET_NETPLAY_CHECK_FRAMES;
          break;
 #endif
       case RARCH_OVERRIDE_SETTING_UPS_PREF:
@@ -3548,16 +3548,16 @@ void retroarch_override_setting_unset(
          break;
 #ifdef HAVE_NETWORKING
     case RARCH_OVERRIDE_SETTING_NETPLAY_MODE:
-         net_st->has_set_netplay_mode = false;
+         net_st->flags &= ~NET_DRIVER_ST_FLAG_HAS_SET_NETPLAY_MODE;
          break;
       case RARCH_OVERRIDE_SETTING_NETPLAY_IP_ADDRESS:
-         net_st->has_set_netplay_ip_address = false;
+         net_st->flags &= ~NET_DRIVER_ST_FLAG_HAS_SET_NETPLAY_IP_ADDRESS;
          break;
       case RARCH_OVERRIDE_SETTING_NETPLAY_IP_PORT:
-         net_st->has_set_netplay_ip_port = false;
+         net_st->flags &= ~NET_DRIVER_ST_FLAG_HAS_SET_NETPLAY_IP_PORT;
          break;
       case RARCH_OVERRIDE_SETTING_NETPLAY_CHECK_FRAMES:
-         net_st->has_set_netplay_check_frames = false;
+         net_st->flags &= ~NET_DRIVER_ST_FLAG_HAS_SET_NETPLAY_CHECK_FRAMES;
          break;
 #endif
       case RARCH_OVERRIDE_SETTING_UPS_PREF:
@@ -5889,13 +5889,13 @@ bool retroarch_override_setting_is_set(
          return ((p_rarch->flags & RARCH_FLAGS_HAS_SET_STATE_PATH) > 0);
 #ifdef HAVE_NETWORKING
       case RARCH_OVERRIDE_SETTING_NETPLAY_MODE:
-	 return net_st->has_set_netplay_mode;
+         return ((net_st->flags & NET_DRIVER_ST_FLAG_HAS_SET_NETPLAY_MODE) > 0);
       case RARCH_OVERRIDE_SETTING_NETPLAY_IP_ADDRESS:
-	 return net_st->has_set_netplay_ip_address;
+         return ((net_st->flags & NET_DRIVER_ST_FLAG_HAS_SET_NETPLAY_IP_ADDRESS) > 0);
       case RARCH_OVERRIDE_SETTING_NETPLAY_IP_PORT:
-	 return net_st->has_set_netplay_ip_port;
+         return ((net_st->flags & NET_DRIVER_ST_FLAG_HAS_SET_NETPLAY_IP_PORT) > 0);
       case RARCH_OVERRIDE_SETTING_NETPLAY_CHECK_FRAMES:
-	 return net_st->has_set_netplay_check_frames;
+         return ((net_st->flags & NET_DRIVER_ST_FLAG_HAS_SET_NETPLAY_CHECK_FRAMES) > 0);
 #endif
 #ifdef HAVE_PATCH
       case RARCH_OVERRIDE_SETTING_UPS_PREF: