diff --git a/src/backend/distributed/commands/multi_copy.c b/src/backend/distributed/commands/multi_copy.c
index c857e754f..dfb7ec164 100644
--- a/src/backend/distributed/commands/multi_copy.c
+++ b/src/backend/distributed/commands/multi_copy.c
@@ -2821,8 +2821,8 @@ ProcessCopyStmt(CopyStmt *copyStatement, QueryCompletionCompat *completionTag, c
 
 		/* consider using RangeVarGetRelidExtended to check perms before locking */
 		Relation copiedRelation = table_openrv(copyStatement->relation,
-											  isFrom ? RowExclusiveLock :
-											  AccessShareLock);
+											   isFrom ? RowExclusiveLock :
+											   AccessShareLock);
 
 		bool isCitusRelation = IsCitusTable(RelationGetRelid(copiedRelation));
 
diff --git a/src/backend/distributed/executor/multi_executor.c b/src/backend/distributed/executor/multi_executor.c
index d0c04e396..9296397cb 100644
--- a/src/backend/distributed/executor/multi_executor.c
+++ b/src/backend/distributed/executor/multi_executor.c
@@ -628,11 +628,12 @@ ExecutePlanIntoDestReceiver(PlannedStmt *queryPlan, ParamListInfo params,
 	/* don't display the portal in pg_cursors, it is for internal use only */
 	portal->visible = false;
 
-	PortalDefineQuerySelectCompat(portal,
-								  NULL,
-								  "",
-								  list_make1(queryPlan),
-								  NULL);
+	PortalDefineQuery(portal,
+					  NULL,
+					  "",
+					  CMDTAG_SELECT_COMPAT,
+					  list_make1(queryPlan),
+					  NULL);
 
 	PortalStart(portal, params, eflags, GetActiveSnapshot());
 	PortalRun(portal, count, false, true, dest, dest, NULL);
diff --git a/src/backend/distributed/executor/partitioned_intermediate_results.c b/src/backend/distributed/executor/partitioned_intermediate_results.c
index 21722dbfc..d0dec1dc3 100644
--- a/src/backend/distributed/executor/partitioned_intermediate_results.c
+++ b/src/backend/distributed/executor/partitioned_intermediate_results.c
@@ -266,7 +266,8 @@ StartPortalForQueryExecution(const char *queryString)
 	/* don't display the portal in pg_cursors, it is for internal use only */
 	portal->visible = false;
 
-	PortalDefineQuerySelectCompat(portal, NULL, queryString, list_make1(queryPlan), NULL);
+	PortalDefineQuery(portal, NULL, queryString, CMDTAG_SELECT_COMPAT, list_make1(
+						  queryPlan), NULL);
 	int eflags = 0;
 	PortalStart(portal, NULL, eflags, GetActiveSnapshot());
 
diff --git a/src/backend/distributed/metadata/metadata_utility.c b/src/backend/distributed/metadata/metadata_utility.c
index b3655853b..53774bc09 100644
--- a/src/backend/distributed/metadata/metadata_utility.c
+++ b/src/backend/distributed/metadata/metadata_utility.c
@@ -634,7 +634,7 @@ NodeGroupHasShardPlacements(int32 groupId, bool onlyConsiderActivePlacements)
 	ScanKeyData scanKey[2];
 
 	Relation pgPlacement = table_open(DistPlacementRelationId(),
-									 AccessShareLock);
+									  AccessShareLock);
 
 	ScanKeyInit(&scanKey[0], Anum_pg_dist_placement_groupid,
 				BTEqualStrategyNumber, F_INT4EQ, Int32GetDatum(groupId));
diff --git a/src/backend/distributed/transaction/transaction_recovery.c b/src/backend/distributed/transaction/transaction_recovery.c
index f868efffb..4fc90f705 100644
--- a/src/backend/distributed/transaction/transaction_recovery.c
+++ b/src/backend/distributed/transaction/transaction_recovery.c
@@ -95,7 +95,8 @@ LogTransactionRecord(int32 groupId, char *transactionName)
 	values[Anum_pg_dist_transaction_gid - 1] = CStringGetTextDatum(transactionName);
 
 	/* open transaction relation and insert new tuple */
-	Relation pgDistTransaction = table_open(DistTransactionRelationId(), RowExclusiveLock);
+	Relation pgDistTransaction = table_open(DistTransactionRelationId(),
+											RowExclusiveLock);
 
 	TupleDesc tupleDescriptor = RelationGetDescr(pgDistTransaction);
 	HeapTuple heapTuple = heap_form_tuple(tupleDescriptor, values, isNulls);
@@ -172,7 +173,7 @@ RecoverWorkerTransactions(WorkerNode *workerNode)
 
 	/* take table lock first to avoid running concurrently */
 	Relation pgDistTransaction = table_open(DistTransactionRelationId(),
-										   ShareUpdateExclusiveLock);
+											ShareUpdateExclusiveLock);
 	TupleDesc tupleDescriptor = RelationGetDescr(pgDistTransaction);
 
 	/*
diff --git a/src/include/distributed/version_compat.h b/src/include/distributed/version_compat.h
index 75bef4f04..99f147070 100644
--- a/src/include/distributed/version_compat.h
+++ b/src/include/distributed/version_compat.h
@@ -34,10 +34,8 @@
 #define pg_plan_query_compat(p, q, c, b) pg_plan_query(p, q, c, b)
 #define planner_compat(p, c, b) planner(p, NULL, c, b)
 #define standard_planner_compat(a, c, d) standard_planner(a, NULL, c, d)
-#define PortalDefineQuerySelectCompat(a, b, c, d, e) PortalDefineQuery(a, b, c, \
-																	   CMDTAG_SELECT, d, \
-																	   e)
 #define getOwnedSequencesCompat(a, b) getOwnedSequences(a)
+#define CMDTAG_SELECT_COMPAT CMDTAG_SELECT
 #define ExplainOnePlanCompat(a, b, c, d, e, f, g) ExplainOnePlan(a, b, c, d, e, f, g, \
 																 NULL)
 #define varoattno varattnosyn
@@ -51,8 +49,7 @@
 #define pg_plan_query_compat(p, q, c, b) pg_plan_query(p, c, b)
 #define planner_compat(p, c, b) planner(p, c, b)
 #define standard_planner_compat(a, c, d) standard_planner(a, c, d)
-#define PortalDefineQuerySelectCompat(a, b, c, d, e) PortalDefineQuery(a, b, c, "SELECT", \
-																	   d, e)
+#define CMDTAG_SELECT_COMPAT "SELECT"
 #define getOwnedSequencesCompat(a, b) getOwnedSequences(a, b)
 #define ExplainOnePlanCompat(a, b, c, d, e, f, g) ExplainOnePlan(a, b, c, d, e, f, g)
 #define Set_ptr_value(a, b) ((a)->data.ptr_value = (b))