diff --git a/core/mac/inc/wni_cfg.h b/core/mac/inc/wni_cfg.h
index 3c4a8a6677a8..3cc3706d98c7 100644
--- a/core/mac/inc/wni_cfg.h
+++ b/core/mac/inc/wni_cfg.h
@@ -1459,11 +1459,11 @@ enum {
 #define WNI_CFG_HE_MU_BEAMFORMER_STAMAX 1
 #define WNI_CFG_HE_MU_BEAMFORMER_STADEF 0
 
-#define WNI_CFG_HE_BFEE_STS_LT80_STAMIN 0x3
+#define WNI_CFG_HE_BFEE_STS_LT80_STAMIN 0
 #define WNI_CFG_HE_BFEE_STS_LT80_STAMAX 0x7
 #define WNI_CFG_HE_BFEE_STS_LT80_STADEF 0
 
-#define WNI_CFG_HE_BFEE_STS_GT80_STAMIN 0x3
+#define WNI_CFG_HE_BFEE_STS_GT80_STAMIN 0
 #define WNI_CFG_HE_BFEE_STS_GT80_STAMAX 0x7
 #define WNI_CFG_HE_BFEE_STS_GT80_STADEF 0
 
diff --git a/core/mac/src/cfg/cfg_api.c b/core/mac/src/cfg/cfg_api.c
index 3003b7025f53..9061a04822f4 100644
--- a/core/mac/src/cfg/cfg_api.c
+++ b/core/mac/src/cfg/cfg_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2018 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -257,9 +257,10 @@ tSirRetStatus cfg_set_int(tpAniSirGlobal pMac, uint16_t cfgId, uint32_t value)
 
 	if ((pMac->cfg.gCfgIBufMin[index] > value) ||
 			(pMac->cfg.gCfgIBufMax[index] < value)) {
-		pe_warn("Value: %d out of range: [%d,%d] cfg id: %d", value,
-			       pMac->cfg.gCfgIBufMin[index],
-			       pMac->cfg.gCfgIBufMax[index], cfgId);
+		pe_warn("Value: %d out of range: [%d,%d] cfg id: %d, %s",
+				value, pMac->cfg.gCfgIBufMin[index],
+				pMac->cfg.gCfgIBufMax[index], cfgId,
+				cfg_get_string(cfgId));
 		return eSIR_CFG_INVALID_ID;
 	} else {
 		/* Write integer value */
diff --git a/core/mac/src/cfg/cfg_proc_msg.c b/core/mac/src/cfg/cfg_proc_msg.c
index 2f04bac03538..a90b9e7cc281 100644
--- a/core/mac/src/cfg/cfg_proc_msg.c
+++ b/core/mac/src/cfg/cfg_proc_msg.c
@@ -1178,7 +1178,6 @@ cgstatic cfg_static[CFG_PARAM_MAX_NUM] = {
 	WNI_CFG_HE_MU_PPDU_STADEF},
 	{WNI_CFG_HE_SU_BEAMFORMER,
 	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
-	CFG_CTL_VALID | CFG_CTL_RE | CFG_CTL_WE | CFG_CTL_INT,
 	WNI_CFG_HE_SU_BEAMFORMER_STAMIN, WNI_CFG_HE_SU_BEAMFORMER_STAMAX,
 	WNI_CFG_HE_SU_BEAMFORMER_STADEF},
 	{WNI_CFG_HE_SU_BEAMFORMEE,