diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 150f11a1..63e3f01e 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -73,6 +73,10 @@ jobs:
           dotnet test --no-restore CoseSignTool.MST.Plugin.Tests/CoseSignTool.MST.Plugin.Tests.csproj
           dotnet test --no-restore CoseSignTool.IndirectSignature.Plugin.Tests/CoseSignTool.IndirectSignature.Plugin.Tests.csproj
 
+    # Build Release to catch issues the internal ADO pipeline would hit (e.g. netstandard2.0 API surface differences).
+    - name: Build Release
+      run: dotnet build --configuration Release CoseSignTool.sln
+
     # List the contents of the working directory to make sure all the artifacts are there.
     - name: List working directory
       run: ${{ matrix.dir_command }}
diff --git a/CoseSign1.Transparent.MST/MstServiceException.cs b/CoseSign1.Transparent.MST/MstServiceException.cs
index f276d392..e2acc4f5 100644
--- a/CoseSign1.Transparent.MST/MstServiceException.cs
+++ b/CoseSign1.Transparent.MST/MstServiceException.cs
@@ -126,7 +126,7 @@ public static MstServiceException FromRequestFailedException(Azure.RequestFailed
         {
             var contentType = response.Headers.ContentType;
 
-            if (contentType?.Contains("cbor", StringComparison.OrdinalIgnoreCase) == true)
+            if (contentType?.IndexOf("cbor", StringComparison.OrdinalIgnoreCase) >= 0)
             {
                 try
                 {
diff --git a/Directory.Build.props b/Directory.Build.props
index f15f7d97..1c4e5f1e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -7,7 +7,5 @@
     <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
     <!-- Configure architecture for macOS ARM64 runners -->
     <TestingPlatformArchitecture Condition="'$(OS)' == 'Unix' AND $([MSBuild]::IsOSPlatform('OSX'))">arm64</TestingPlatformArchitecture>
-    <!-- Alternative: Use RuntimeIdentifier on macOS -->
-    <RuntimeIdentifier Condition="'$(OS)' == 'Unix' AND $([MSBuild]::IsOSPlatform('OSX')) AND '$(RuntimeIdentifier)' == ''">osx-arm64</RuntimeIdentifier>
   </PropertyGroup>
 </Project>