diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props
index 8ffc17440f..c44676b170 100644
--- a/eng/PatchConfig.props
+++ b/eng/PatchConfig.props
@@ -41,6 +41,9 @@ Later on, this will be checked using this condition:
   </PropertyGroup>
   <PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.5' ">
     <PackagesInPatch>
+      Microsoft.AspNetCore.AspNetCoreModule;
+      Microsoft.AspNetCore.AspNetCoreModuleV2;
+      java:signalr;
     </PackagesInPatch>
   </PropertyGroup>
 
diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.cpp b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.cpp
index 7727eeed5c..7b43840c52 100644
--- a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.cpp
+++ b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.cpp
@@ -104,7 +104,7 @@ AddConfigSection(
 	if (aspNetCoreNode == NULL)
 	{
 		RETURN_IF_FAILED(hr = pXMLDoc->createElement(section, &element));
-		
+
 		RETURN_IF_FAILED(hr = element->setAttribute(name, CComVariant(aspNetCore)));
 
 		RETURN_IF_FAILED(hr = element->setAttribute(overrideMode, CComVariant(allow)));
@@ -130,7 +130,6 @@ RemoveConfigSection(
     IXMLDOMNode* webServerNode;
     IXMLDOMNode* aspNetCoreNode;
     IXMLDOMNode* tempNode;
-    IXMLDOMElement* element;
     STRU customActionData;
 
     CComBSTR selectLanguage = SysAllocString(L"SelectionLanguage");
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ConnectionAdapterTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ConnectionAdapterTests.cs
index c54c2a031b..07ea11262b 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ConnectionAdapterTests.cs
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ConnectionAdapterTests.cs
@@ -146,6 +146,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests
 
             var serviceContext = new TestServiceContext(LoggerFactory);
 
+            TestApplicationErrorLogger.ThrowOnUngracefulShutdown = false;
+
             var stopTask = Task.CompletedTask;
             await using (var server = new TestServer(requestDelegate, serviceContext, listenOptions))
             using (var shutdownCts = new CancellationTokenSource(TestConstants.DefaultTimeout))