diff --git a/src/backend/distributed/operations/citus_split_shard_by_split_points.c b/src/backend/distributed/operations/citus_split_shard_by_split_points.c
index 848597e38..59b7b26b7 100644
--- a/src/backend/distributed/operations/citus_split_shard_by_split_points.c
+++ b/src/backend/distributed/operations/citus_split_shard_by_split_points.c
@@ -81,11 +81,11 @@ LookupSplitMode(Oid shardSplitModeOid)
 	{
 		shardSplitMode = BLOCKING_SPLIT;
 	}
-
 	/* Extend with other modes as we support them */
 	else
 	{
-		ereport(ERROR, (errmsg("Invalid label for enum: %s", enumLabel)));
+		ereport(ERROR, (errmsg("Invalid split mode: %s. Expected split mode is blocking.",
+							   enumLabel)));
 	}
 
 	return shardSplitMode;
diff --git a/src/backend/distributed/operations/shard_split.c b/src/backend/distributed/operations/shard_split.c
index 094984f85..333d81e31 100644
--- a/src/backend/distributed/operations/shard_split.c
+++ b/src/backend/distributed/operations/shard_split.c
@@ -792,8 +792,10 @@ CreateForeignKeyConstraints(List *shardGroupSplitIntervalListList,
 														 referenceTableForeignConstraintList);
 
 			List *constraintCommandList = NIL;
-			constraintCommandList = list_concat(constraintCommandList, shardForeignConstraintCommandList);
-			constraintCommandList = list_concat(constraintCommandList, referenceTableForeignConstraintList);
+			constraintCommandList = list_concat(constraintCommandList,
+												shardForeignConstraintCommandList);
+			constraintCommandList = list_concat(constraintCommandList,
+												referenceTableForeignConstraintList);
 
 			char *constraintCommand = NULL;
 			foreach_ptr(constraintCommand, constraintCommandList)
diff --git a/src/backend/distributed/operations/worker_shard_copy.c b/src/backend/distributed/operations/worker_shard_copy.c
index ea601fba5..473f3b670 100644
--- a/src/backend/distributed/operations/worker_shard_copy.c
+++ b/src/backend/distributed/operations/worker_shard_copy.c
@@ -74,7 +74,6 @@ static bool CanUseLocalCopy(uint64 destinationNodeId);
 static StringInfo ConstructCopyStatement(List *destinationShardFullyQualifiedName, bool
 										 useBinaryFormat);
 static void WriteLocalTuple(TupleTableSlot *slot, ShardCopyDestReceiver *copyDest);
-static bool ShouldSendCopyNow(StringInfo buffer);
 static int ReadFromLocalBufferCallback(void *outBuf, int minRead, int maxRead);
 static void LocalCopyToShard(ShardCopyDestReceiver *copyDest, CopyOutState
 							 localCopyOutState);
@@ -88,18 +87,6 @@ CanUseLocalCopy(uint64 destinationNodeId)
 }
 
 
-/*
- * ShouldSendCopyNow returns true if the given buffer size exceeds the
- * local copy buffer size threshold.
- */
-static bool
-ShouldSendCopyNow(StringInfo buffer)
-{
-	/* LocalCopyFlushThreshold is in bytes */
-	return buffer->len > LocalCopyFlushThresholdByte;
-}
-
-
 /* Connect to node with source shard and trigger copy start.  */
 static void
 ConnectToRemoteAndStartCopy(ShardCopyDestReceiver *copyDest)
@@ -197,7 +184,7 @@ ShardCopyDestReceiverReceive(TupleTableSlot *slot, DestReceiver *dest)
 	if (copyDest->useLocalCopy)
 	{
 		WriteLocalTuple(slot, copyDest);
-		if (ShouldSendCopyNow(copyOutState->fe_msgbuf))
+		if (copyOutState->fe_msgbuf->len > LocalCopyFlushThresholdByte)
 		{
 			LocalCopyToShard(copyDest, copyOutState);
 		}
diff --git a/src/backend/distributed/operations/worker_split_copy_udf.c b/src/backend/distributed/operations/worker_split_copy_udf.c
index 0314875b0..7c92ca524 100644
--- a/src/backend/distributed/operations/worker_split_copy_udf.c
+++ b/src/backend/distributed/operations/worker_split_copy_udf.c
@@ -197,9 +197,9 @@ CreateShardCopyDestReceivers(EState *estate, ShardInterval *shardIntervalToSplit
 	char *sourceShardNamePrefix = get_rel_name(shardIntervalToSplitCopy->relationId);
 	foreach_ptr(splitCopyInfo, splitCopyInfoList)
 	{
-		char *destinationShardSchemaName = get_namespace_name(get_rel_namespace(
-																  shardIntervalToSplitCopy
-																  ->relationId));
+		char *destinationShardSchemaOid = get_rel_namespace(
+			shardIntervalToSplitCopy->relationId);
+		char *destinationShardSchemaName = get_namespace_name(destinationShardSchemaOid);
 		char *destinationShardNameCopy = pstrdup(sourceShardNamePrefix);
 		AppendShardIdToName(&destinationShardNameCopy, splitCopyInfo->destinationShardId);
 
diff --git a/src/backend/distributed/sql/downgrades/citus--11.1-1--11.0-2.sql b/src/backend/distributed/sql/downgrades/citus--11.1-1--11.0-2.sql
index 0a6ec8599..f81305aa4 100644
--- a/src/backend/distributed/sql/downgrades/citus--11.1-1--11.0-2.sql
+++ b/src/backend/distributed/sql/downgrades/citus--11.1-1--11.0-2.sql
@@ -46,8 +46,8 @@ CREATE FUNCTION pg_catalog.worker_repartition_cleanup(bigint)
  STRICT
 AS 'MODULE_PATHNAME', $function$worker_repartition_cleanup$function$;
 
-DROP TYPE IF EXISTS citus.split_mode;
-DROP TYPE IF EXISTS citus.split_copy_info;
+DROP TYPE citus.split_mode;
+DROP TYPE citus.split_copy_info;
 DROP FUNCTION pg_catalog.citus_split_shard_by_split_points(
     shard_id bigint,
     split_points text[],
diff --git a/src/backend/distributed/sql/udfs/worker_split_copy/11.0-2.sql b/src/backend/distributed/sql/udfs/worker_split_copy/11.0-2.sql
index 7f35d2b4f..b9c5869d2 100644
--- a/src/backend/distributed/sql/udfs/worker_split_copy/11.0-2.sql
+++ b/src/backend/distributed/sql/udfs/worker_split_copy/11.0-2.sql
@@ -14,4 +14,4 @@ RETURNS void
 LANGUAGE C STRICT
 AS 'MODULE_PATHNAME', $$worker_split_copy$$;
 COMMENT ON FUNCTION pg_catalog.worker_split_copy(source_shard_id bigint, splitCopyInfos citus.split_copy_info[])
-    IS 'Perform split copy for shard'
+    IS 'Perform split copy for shard';
diff --git a/src/backend/distributed/sql/udfs/worker_split_copy/latest.sql b/src/backend/distributed/sql/udfs/worker_split_copy/latest.sql
index 7f35d2b4f..b9c5869d2 100644
--- a/src/backend/distributed/sql/udfs/worker_split_copy/latest.sql
+++ b/src/backend/distributed/sql/udfs/worker_split_copy/latest.sql
@@ -14,4 +14,4 @@ RETURNS void
 LANGUAGE C STRICT
 AS 'MODULE_PATHNAME', $$worker_split_copy$$;
 COMMENT ON FUNCTION pg_catalog.worker_split_copy(source_shard_id bigint, splitCopyInfos citus.split_copy_info[])
-    IS 'Perform split copy for shard'
+    IS 'Perform split copy for shard';