diff --git a/hal/wifi3.0/hal_srng.c b/hal/wifi3.0/hal_srng.c
index 90125f7dc4..b5501b0e6c 100644
--- a/hal/wifi3.0/hal_srng.c
+++ b/hal/wifi3.0/hal_srng.c
@@ -427,7 +427,6 @@ static void hal_target_based_configure(struct hal_soc *hal)
 	case TARGET_TYPE_WCN7850:
 		hal->use_register_windowing = true;
 		hal_wcn7850_attach(hal);
-		hal->init_phase = false;
 		break;
 #endif
 #if defined(QCA_WIFI_QCA8074) && defined(WIFI_TARGET_TYPE_3_0)
diff --git a/hif/src/pcie/if_pci.c b/hif/src/pcie/if_pci.c
index 9418dfe57a..484a030d16 100644
--- a/hif/src/pcie/if_pci.c
+++ b/hif/src/pcie/if_pci.c
@@ -3485,6 +3485,7 @@ static void hif_pci_init_reg_windowing_support(struct hif_pci_softc *sc,
 	case TARGET_TYPE_QCN7605:
 	case TARGET_TYPE_QCA6490:
 	case TARGET_TYPE_QCA6390:
+	case TARGET_TYPE_WCN7850:
 		sc->use_register_windowing = true;
 		qdf_spinlock_create(&sc->register_access_lock);
 		sc->register_window = 0;
@@ -3739,7 +3740,7 @@ bool hif_pci_needs_bmi(struct hif_softc *scn)
 }
 
 #ifdef FORCE_WAKE
-#ifdef DEVICE_FORCE_WAKE_ENABLE
+#if defined(DEVICE_FORCE_WAKE_ENABLE) && !defined(CONFIG_PLD_PCIE_FW_SIM)
 
 /**
  * HIF_POLL_UMAC_WAKE poll value to indicate if UMAC is powered up