diff --git a/hif/src/ce/ce_assignment.h b/hif/src/ce/ce_assignment.h
index 9ff907f23fbf..a0790e6bb3a6 100644
--- a/hif/src/ce/ce_assignment.h
+++ b/hif/src/ce/ce_assignment.h
@@ -94,7 +94,7 @@ static struct CE_attr host_ce_config_wlan[] = {
 		2, DIAG_TRANSFER_LIMIT, 2, NULL,},
 	/* Target to uMC */
 	{ /* CE8 */ CE_ATTR_FLAGS, 0, 0, 0, 0, NULL,},
-	/*The following CEs are not being used yet */
+	/* The following CEs are not being used yet */
 	{ /* CE9 */ CE_ATTR_FLAGS, 0, 0,  0, 0, NULL,},
 	{ /* CE10 */ CE_ATTR_FLAGS, 0, 0, 0, 0, NULL,},
 	{ /* CE11 */ CE_ATTR_FLAGS, 0, 0, 0, 0, NULL,},
@@ -123,7 +123,7 @@ static struct CE_pipe_config target_ce_config_wlan[] = {
 		(CE_ATTR_FLAGS | CE_ATTR_DISABLE_INTR), 0,},
 	/* CE8 used only by IPA */
 	{ /* CE8 */ 8, PIPEDIR_IN, 32, 2048, CE_ATTR_FLAGS, 0,},
-	/*The following CEs are not being used yet*/
+	/* The following CEs are not being used yet*/
 	{ /* CE9 */ 9, PIPEDIR_IN,  0, 0, CE_ATTR_FLAGS, 0,},
 	{ /* CE10 */ 9, PIPEDIR_IN,  0, 0, CE_ATTR_FLAGS, 0,},
 	{ /* CE11 */ 9, PIPEDIR_IN,  0, 0, CE_ATTR_FLAGS, 0,},
@@ -251,6 +251,11 @@ static struct CE_attr host_ce_config_wlan_epping_poll[] = {
 	{ /* CE6 */ CE_ATTR_FLAGS, 0, 0,   0, 0, NULL,},
 	/* ce_diag, the Diagnostic Window */
 	{ /* CE7 */ CE_ATTR_FLAGS, 0, 2,   DIAG_TRANSFER_LIMIT, 2, NULL,},
+	{ /* CE8 */ CE_ATTR_FLAGS, 0, 0, 0, 0, NULL,},
+	/* The following CEs are not being used yet */
+	{ /* CE9 */ CE_ATTR_FLAGS, 0, 0,  0, 0, NULL,},
+	{ /* CE10 */ CE_ATTR_FLAGS, 0, 0, 0, 0, NULL,},
+	{ /* CE11 */ CE_ATTR_FLAGS, 0, 0, 0, 0, NULL,},
 };
 static struct CE_attr host_ce_config_wlan_epping_irq[] = {
 	/* host->target HTC control and raw streams */
@@ -269,6 +274,11 @@ static struct CE_attr host_ce_config_wlan_epping_irq[] = {
 	{ /* CE6 */ CE_ATTR_FLAGS, 0, 0, 0, 0, NULL,},
 	/* ce_diag, the Diagnostic Window */
 	{ /* CE7 */ CE_ATTR_FLAGS, 0, 2, DIAG_TRANSFER_LIMIT, 2, NULL,},
+	{ /* CE8 */ CE_ATTR_FLAGS, 0, 0, 0, 0, NULL,},
+	/* The following CEs are not being used yet */
+	{ /* CE9 */ CE_ATTR_FLAGS, 0, 0,  0, 0, NULL,},
+	{ /* CE10 */ CE_ATTR_FLAGS, 0, 0, 0, 0, NULL,},
+	{ /* CE11 */ CE_ATTR_FLAGS, 0, 0, 0, 0, NULL,},
 };
 /*
  * EP-ping firmware's CE configuration
@@ -291,7 +301,10 @@ static struct CE_pipe_config target_ce_config_wlan_epping[] = {
 	/* CE7 used only by Host */
 	{ /* CE7 */ 7, PIPEDIR_INOUT_H2H, 0, 0, 0, 0,},
 	/* CE8 used only by IPA */
-	{ /* CE8 */ 8, PIPEDIR_IN, 32, 2048, CE_ATTR_FLAGS, 0,}
+	{ /* CE8 */ 8, PIPEDIR_IN, 32, 2048, CE_ATTR_FLAGS, 0,},
+	{ /* CE9 */ 9, PIPEDIR_IN,  0, 0, CE_ATTR_FLAGS, 0,},
+	{ /* CE10 */ 10, PIPEDIR_IN,  0, 0, CE_ATTR_FLAGS, 0,},
+	{ /* CE11 */ 11, PIPEDIR_IN,  0, 0, CE_ATTR_FLAGS, 0,},
 };
 #endif
 
diff --git a/hif/src/ce/ce_main.c b/hif/src/ce/ce_main.c
index 5daacd80dfbf..1aeb199a9553 100644
--- a/hif/src/ce/ce_main.c
+++ b/hif/src/ce/ce_main.c
@@ -2102,7 +2102,8 @@ u32 shadow_sr_wr_ind_addr(struct hif_softc *scn, u32 ctrl_addr)
 		addr = SHADOW_VALUE7;
 		break;
 	default:
-		HIF_ERROR("invalid CE ctrl_addr\n");
+		HIF_ERROR("invalid CE ctrl_addr %d",
+			COPY_ENGINE_ID(ctrl_addr));
 		QDF_ASSERT(0);
 
 	}
@@ -2131,7 +2132,8 @@ u32 shadow_dst_wr_ind_addr(struct hif_softc *scn, u32 ctrl_addr)
 		addr = SHADOW_VALUE20;
 		break;
 	default:
-		HIF_ERROR("invalid CE ctrl_addr\n");
+		HIF_ERROR("invalid CE ctrl_addr %d",
+			COPY_ENGINE_ID(ctrl_addr));
 		QDF_ASSERT(0);
 	}