diff --git a/src/wifi/model/wifi-phy.cc b/src/wifi/model/wifi-phy.cc
index 58df04dad..d07a35e1b 100644
--- a/src/wifi/model/wifi-phy.cc
+++ b/src/wifi/model/wifi-phy.cc
@@ -1092,11 +1092,15 @@ void
 WifiPhy::Configure80211ax (void)
 {
   NS_LOG_FUNCTION (this);
-  Configure80211n ();
   if (Is5Ghz (GetFrequency ()))
     {
       Configure80211ac ();
     }
+  else
+    {
+      Configure80211n ();
+    }
+  
   m_deviceMcsSet.push_back (WifiPhy::GetHeMcs0 ());
   m_deviceMcsSet.push_back (WifiPhy::GetHeMcs1 ());
   m_deviceMcsSet.push_back (WifiPhy::GetHeMcs2 ());
@@ -1248,8 +1252,6 @@ WifiPhy::ConfigureStandard (WifiPhyStandard standard)
       ConfigureHolland ();
       break;
     case WIFI_PHY_STANDARD_80211n_2_4GHZ:
-      Configure80211n ();
-      break;
     case WIFI_PHY_STANDARD_80211n_5GHZ:
       Configure80211n ();
       break;
@@ -1257,8 +1259,6 @@ WifiPhy::ConfigureStandard (WifiPhyStandard standard)
       Configure80211ac ();
       break;
     case WIFI_PHY_STANDARD_80211ax_2_4GHZ:
-      Configure80211ax ();
-      break;
     case WIFI_PHY_STANDARD_80211ax_5GHZ:
       Configure80211ax ();
       break;
diff --git a/src/wifi/model/wifi-remote-station-manager.cc b/src/wifi/model/wifi-remote-station-manager.cc
index 10d101546..dd1688fcf 100644
--- a/src/wifi/model/wifi-remote-station-manager.cc
+++ b/src/wifi/model/wifi-remote-station-manager.cc
@@ -1340,7 +1340,7 @@ WifiRemoteStationManager::AddBasicMode (WifiMode mode)
   NS_LOG_FUNCTION (this << mode);
   if (mode.GetModulationClass () == WIFI_MOD_CLASS_HT || mode.GetModulationClass () == WIFI_MOD_CLASS_VHT || mode.GetModulationClass () == WIFI_MOD_CLASS_HE)
     {
-      NS_FATAL_ERROR ("It is not allowed to add a (V)HT rate in the BSSBasicRateSet!");
+      NS_FATAL_ERROR ("It is not allowed to add a HT, VHT or HE rate in the BSSBasicRateSet!");
     }
   for (uint8_t i = 0; i < GetNBasicModes (); i++)
     {