diff --git a/src/DurableTask.Netherite/OrchestrationService/PartitionErrorHandler.cs b/src/DurableTask.Netherite/OrchestrationService/PartitionErrorHandler.cs
index 558beaa2..dad8b80f 100644
--- a/src/DurableTask.Netherite/OrchestrationService/PartitionErrorHandler.cs
+++ b/src/DurableTask.Netherite/OrchestrationService/PartitionErrorHandler.cs
@@ -109,9 +109,9 @@ void Terminate()
 
             try
             {
-                this.logger?.LogDebug("Part{partition:D2} Started PartitionCancellation");
+                this.logger?.LogDebug("Part{partition:D2} Started PartitionCancellation", this.partitionId);
                 this.cts.Cancel();
-                this.logger?.LogDebug("Part{partition:D2} Completed PartitionCancellation");
+                this.logger?.LogDebug("Part{partition:D2} Completed PartitionCancellation", this.partitionId);
             }
             catch (AggregateException aggregate)
             {
@@ -131,7 +131,7 @@ void Shutdown()
             {
                 try
                 {
-                    this.logger?.LogDebug("Part{partition:D2} Started PartitionShutdown");
+                    this.logger?.LogDebug("Part{partition:D2} Started PartitionShutdown", this.partitionId);
 
                     if (this.OnShutdown != null)
                     {
@@ -140,7 +140,7 @@ void Shutdown()
 
                     this.cts.Dispose();
 
-                    this.logger?.LogDebug("Part{partition:D2} Completed PartitionShutdown");
+                    this.logger?.LogDebug("Part{partition:D2} Completed PartitionShutdown", this.partitionId);
                 }
                 catch (AggregateException aggregate)
                 {
diff --git a/src/DurableTask.Netherite/TransportProviders/EventHubs/EventHubsSender.cs b/src/DurableTask.Netherite/TransportProviders/EventHubs/EventHubsSender.cs
index c6bac8f8..8805d01b 100644
--- a/src/DurableTask.Netherite/TransportProviders/EventHubs/EventHubsSender.cs
+++ b/src/DurableTask.Netherite/TransportProviders/EventHubs/EventHubsSender.cs
@@ -137,7 +137,7 @@ async Task SendBatch(int lastPosition)
             }
             catch (Exception e)
             {
-                this.traceHelper.LogWarning(e, "EventHubsSender {eventHubName}/{eventHubPartitionId} failed to send", this.eventHubName, this.eventHubPartition, this.sender.EventHubClient.EventHubName, this.sender.PartitionId);
+                this.traceHelper.LogWarning(e, "EventHubsSender {eventHubName}/{eventHubPartitionId} failed to send", this.eventHubName, this.eventHubPartition);
                 senderException = e;
             }
             finally
@@ -189,9 +189,9 @@ async Task SendBatch(int lastPosition)
                 }
 
                 if (requeued > 0 || dropped > 0)
-                    this.traceHelper.LogWarning("EventHubsSender {eventHubName}/{eventHubPartitionId} has confirmed {confirmed}, requeued {requeued}, dropped {dropped} outbound events", this.eventHubName, this.eventHubPartition, confirmed, requeued, dropped, this.sender.EventHubClient.EventHubName, this.sender.PartitionId);
+                    this.traceHelper.LogWarning("EventHubsSender {eventHubName}/{eventHubPartitionId} has confirmed {confirmed}, requeued {requeued}, dropped {dropped} outbound events", this.eventHubName, this.eventHubPartition, confirmed, requeued, dropped);
                 else
-                    this.traceHelper.LogDebug("EventHubsSender {eventHubName}/{eventHubPartitionId} has confirmed {confirmed}, requeued {requeued}, dropped {dropped} outbound events", this.eventHubName, this.eventHubPartition, confirmed, requeued, dropped, this.sender.EventHubClient.EventHubName, this.sender.PartitionId);
+                    this.traceHelper.LogDebug("EventHubsSender {eventHubName}/{eventHubPartitionId} has confirmed {confirmed}, requeued {requeued}, dropped {dropped} outbound events", this.eventHubName, this.eventHubPartition, confirmed, requeued, dropped);
             }
             catch (Exception exception) when (!Utils.IsFatal(exception))
             {