diff --git a/src/runtime_src/core/common/drv/kds_core.c b/src/runtime_src/core/common/drv/kds_core.c
index cf4248caa09..10184223e9d 100644
--- a/src/runtime_src/core/common/drv/kds_core.c
+++ b/src/runtime_src/core/common/drv/kds_core.c
@@ -1659,7 +1659,10 @@ static int kds_cfg_legacy_update(struct kds_sched *kds)
 	}
 
 run_polling:
-	if ((!KDS_SETTING(kds->cu_intr) && !kds->polling_thread) || kds->scu_mgmt.num_cus) {
+	if (kds->polling_thread)
+		return ret;
+
+	if (!KDS_SETTING(kds->cu_intr) || kds->scu_mgmt.num_cus) {
 		kds->polling_stop = 0;
 		kds->polling_thread = kthread_run(kds_polling_thread, kds, "kds_poll");
 		if (IS_ERR(kds->polling_thread)) {
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/xocl_xclbin.c b/src/runtime_src/core/pcie/driver/linux/xocl/xocl_xclbin.c
index c97817075b3..598bdc89fa0 100644
--- a/src/runtime_src/core/pcie/driver/linux/xocl/xocl_xclbin.c
+++ b/src/runtime_src/core/pcie/driver/linux/xocl/xocl_xclbin.c
@@ -137,7 +137,7 @@ static int xgq_xclbin_download(xdev_handle_t xdev, void *args)
 	struct xclbin_arg *arg = (struct xclbin_arg *)args;
 	int ret;
 
-	ret = xocl_xgq_download_axlf(xdev, arg->xclbin);
+	ret = xocl_xgq_download_axlf_slot(xdev, arg->xclbin, arg->slot_id);
 
 	return ret;
 }