diff --git a/src/backend/distributed/connection/remote_commands.c b/src/backend/distributed/connection/remote_commands.c
index 4b46e96d2..cbd74ff51 100644
--- a/src/backend/distributed/connection/remote_commands.c
+++ b/src/backend/distributed/connection/remote_commands.c
@@ -883,7 +883,7 @@ WaitForAllConnections(List *connectionList, bool raiseInterrupts)
 		palloc(totalConnectionCount * sizeof(MultiConnection *));
 	WaitEvent *events = palloc(totalConnectionCount * sizeof(WaitEvent));
 	bool *connectionReady = palloc(totalConnectionCount * sizeof(bool));
-	WaitEventSet *waitEventSet = NULL;
+	WaitEventSet *volatile waitEventSet = NULL;
 
 	/* convert connection list to an array such that we can move items around */
 	MultiConnection *connectionItem = NULL;
diff --git a/src/backend/distributed/utils/citus_depended_object.c b/src/backend/distributed/utils/citus_depended_object.c
index a160fcd56..bbea9ab4a 100644
--- a/src/backend/distributed/utils/citus_depended_object.c
+++ b/src/backend/distributed/utils/citus_depended_object.c
@@ -465,8 +465,8 @@ static bool
 AnyObjectViolatesOwnership(DropStmt *dropStmt)
 {
 	bool hasOwnershipViolation = false;
-	volatile ObjectAddress objectAddress = { 0 };
-	Relation relation = NULL;
+	ObjectAddress objectAddress = { 0 };
+	volatile Relation relation = NULL;
 	ObjectType objectType = dropStmt->removeType;
 	bool missingOk = dropStmt->missing_ok;