diff --git a/Directory.Packages.props b/Directory.Packages.props
index 76c4dd51..aff8b6de 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -65,7 +65,6 @@
   <!-- Testing Frameworks & Analysis Packages -->
   <ItemGroup>
     <PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
-    <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
     <PackageVersion Include="FluentAssertions" Version="6.12.2" />
     <PackageVersion Include="FluentAssertions.Analyzers" Version="0.34.1"/>
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
diff --git a/samples/ExportHistoryWebApp/ExportHistoryWebApp.csproj b/samples/ExportHistoryWebApp/ExportHistoryWebApp.csproj
index 884da7e8..6c63020a 100644
--- a/samples/ExportHistoryWebApp/ExportHistoryWebApp.csproj
+++ b/samples/ExportHistoryWebApp/ExportHistoryWebApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
diff --git a/src/InProcessTestHost/Sidecar/Grpc/TaskHubGrpcServer.cs b/src/InProcessTestHost/Sidecar/Grpc/TaskHubGrpcServer.cs
index 43603ffa..50f1fe15 100644
--- a/src/InProcessTestHost/Sidecar/Grpc/TaskHubGrpcServer.cs
+++ b/src/InProcessTestHost/Sidecar/Grpc/TaskHubGrpcServer.cs
@@ -902,7 +902,7 @@ async Task SendWorkItemToClientAsync(P.WorkItem workItem)
         {
             outputStream = this.workerToClientStream ??
                 // CA2201: Use specific exception types
-                throw new InvalidOperationException("TODO: No client is connected! Need to wait until a client connects before executing!");
+                throw new InvalidOperationException("No client is connected. Need to wait until a client connects before executing.");
         }
 
         // The gRPC channel can only handle one message at a time, so we need to serialize access to it.