diff --git a/Kbuild b/Kbuild
index b182c78..395c707 100644
--- a/Kbuild
+++ b/Kbuild
@@ -1275,13 +1275,15 @@
 UMAC_SER_OBJ_DIR := $(WLAN_COMMON_ROOT)/$(UMAC_SER_SRC_DIR)
 
 UMAC_SER_INC := -I$(WLAN_COMMON_INC)/$(UMAC_SER_INC_DIR)
-UMAC_SER_OBJS := $(UMAC_SER_OBJ_DIR)/wlan_serialization_dequeue.o \
-		 $(UMAC_SER_OBJ_DIR)/wlan_serialization_enqueue.o \
-		 $(UMAC_SER_OBJ_DIR)/wlan_serialization_main.o \
+UMAC_SER_OBJS := $(UMAC_SER_OBJ_DIR)/wlan_serialization_main.o \
 		 $(UMAC_SER_OBJ_DIR)/wlan_serialization_api.o \
 		 $(UMAC_SER_OBJ_DIR)/wlan_serialization_utils.o \
 		 $(UMAC_SER_OBJ_DIR)/wlan_serialization_legacy_api.o \
-		 $(UMAC_SER_OBJ_DIR)/wlan_serialization_rules.o
+		 $(UMAC_SER_OBJ_DIR)/wlan_serialization_rules.o \
+		 $(UMAC_SER_OBJ_DIR)/wlan_serialization_internal.o \
+		 $(UMAC_SER_OBJ_DIR)/wlan_serialization_non_scan.o \
+		 $(UMAC_SER_OBJ_DIR)/wlan_serialization_queue.o \
+		 $(UMAC_SER_OBJ_DIR)/wlan_serialization_scan.o
 
 ###### WIFI POS ########
 WIFI_POS_OS_IF_DIR := $(WLAN_COMMON_ROOT)/os_if/linux/wifi_pos/src
@@ -2314,7 +2316,6 @@
 
 #CONFIG_SERIALIZATION_V1: Don't use enhancements to serialization component
 #No CONFIG_SERIALIZATION_V1: Use enhancements to serialization component
-cppflags-y += -DCONFIG_SERIALIZATION_V1
 
 ccflags-$(CONFIG_ENABLE_SIZE_OPTIMIZE) += -Os
 
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 228df49..50071ca 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -20347,7 +20347,7 @@
 		cmd_type = WLAN_SER_CMD_FORCE_IBSS_LEAVE;
 		break;
 	case eCsrStopBss:
-		cmd_type = WLAN_SER_CMD_STOP_BSS;
+		cmd_type = WLAN_SER_CMD_VDEV_STOP_BSS;
 		break;
 	case eCsrSmeIssuedFTReassoc:
 		cmd_type = WLAN_SER_CMD_SME_ISSUE_FT_REASSOC;
@@ -20486,6 +20486,8 @@
 	cmd->cmd_timeout_duration = SME_DEFAULT_CMD_TIMEOUT;
 	cmd->cmd_cb = sme_ser_cmd_callback;
 	cmd->is_high_priority = high_priority;
+	cmd->is_blocking = true;
+
 	return QDF_STATUS_SUCCESS;
 }