diff --git a/src/backend/distributed/planner/distributed_planner.c b/src/backend/distributed/planner/distributed_planner.c
index 08662531a..41529e8ec 100644
--- a/src/backend/distributed/planner/distributed_planner.c
+++ b/src/backend/distributed/planner/distributed_planner.c
@@ -133,15 +133,20 @@ static List * TranslatedVars(PlannerInfo *root, int relationIndex);
 /* Distributed planner hook */
 PlannedStmt *
 distributed_planner(Query *parse,
-	#if PG_VERSION_NUM >= PG_VERSION_13
+#if PG_VERSION_NUM >= PG_VERSION_13
 					const char *query_string,
-	#endif
+#endif
 					int cursorOptions,
 					ParamListInfo boundParams)
 {
 	if (UseCustomPath)
 	{
-		return standard_planner(parse, cursorOptions, boundParams);
+		return standard_planner(parse,
+#if PG_VERSION_NUM >= PG_VERSION_13
+								query_string,
+#endif
+								cursorOptions,
+								boundParams);
 	}
 
 	bool needsDistributedPlanning = false;
diff --git a/src/backend/distributed/planner/path_based_planner.c b/src/backend/distributed/planner/path_based_planner.c
index 2efb91ffc..2de1434cf 100644
--- a/src/backend/distributed/planner/path_based_planner.c
+++ b/src/backend/distributed/planner/path_based_planner.c
@@ -151,7 +151,7 @@ CreateDistributedUnionPlan(PlannerInfo *root,
 		initStringInfo(&buf);
 		pg_get_query_def(qc, &buf);
 
-		Task *sqlTask = CreateBasicTask(workerJob->jobId, i, SELECT_TASK, buf.data);
+		Task *sqlTask = CreateBasicTask(workerJob->jobId, i, READ_TASK, buf.data);
 		sqlTask->anchorShardId = shardInterval->shardId;
 		sqlTask->taskPlacementList = ActiveShardPlacementList(shardInterval->shardId);
 		workerJob->taskList = lappend(workerJob->taskList, sqlTask);
@@ -163,7 +163,7 @@ CreateDistributedUnionPlan(PlannerInfo *root,
 	distributedPlan->workerJob = workerJob;
 	distributedPlan->modLevel = ROW_MODIFY_READONLY;
 	distributedPlan->relationIdList = list_make1_oid(distUnion->sampleRelid);
-	distributedPlan->hasReturning = true;
+	distributedPlan->expectResults = true;
 
 	Plan *subPlan = NULL;
 	int subPlanCount = 0;
@@ -302,12 +302,13 @@ PathBasedPlannerRelationHook(PlannerInfo *root,
 	foreach(pathCell, relOptInfo->pathlist)
 	{
 		Path *originalPath = lfirst(pathCell);
-		pathCell->data.ptr_value =
-			WrapTableAccessWithDistributedUnion(originalPath,
-												TableColocationId(rte->relid),
-												partitionValue,
-												rte->relid,
-												NIL);
+		CustomPath *wrappedPath = WrapTableAccessWithDistributedUnion(
+			originalPath,
+			TableColocationId(rte->relid),
+			partitionValue,
+			rte->relid,
+			NIL);
+		SetListCellPtr(pathCell, wrappedPath);
 	}
 }
 
@@ -923,8 +924,9 @@ PathBasedPlannerGroupAgg(PlannerInfo *root,
 	ListCell *pathCell = NULL;
 	foreach(pathCell, output_rel->pathlist)
 	{
-		Path *originalPath = pathCell->data.ptr_value;
-		pathCell->data.ptr_value = OptimizeGroupAgg(root, originalPath);
+		Path *originalPath = lfirst(pathCell);
+		Path *optimizedGroupAdd = OptimizeGroupAgg(root, originalPath);
+		SetListCellPtr(pathCell, optimizedGroupAdd);
 	}
 }