diff --git a/src/Microsoft.OpenApi.Hidi/Formatters/PowerShellFormatter.cs b/src/Microsoft.OpenApi.Hidi/Formatters/PowerShellFormatter.cs
index 4db55a05e..45fac0270 100644
--- a/src/Microsoft.OpenApi.Hidi/Formatters/PowerShellFormatter.cs
+++ b/src/Microsoft.OpenApi.Hidi/Formatters/PowerShellFormatter.cs
@@ -133,7 +133,7 @@ private static string SingularizeAndDeduplicateOperationId(IList<string> operati
 
                 singularizedSegments.Add(segment);
             }
-            return string.Join(".", singularizedSegments);
+            return string.Join('.', singularizedSegments);
         }
 
         private static string RemoveHashSuffix(string operationId)
@@ -153,7 +153,7 @@ private static string RemoveKeyTypeSegment(string operationId, IList<OpenApiPara
                     segments.Remove(keyTypeExtension);
                 }
             }
-            return string.Join(".", segments);
+            return string.Join('.', segments);
         }
 
         private static IList<OpenApiParameter> ResolveFunctionParameters(IList<OpenApiParameter> parameters)
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs
index 806c96877..f6754dd54 100644
--- a/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs
+++ b/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs
@@ -213,7 +213,11 @@ private static string BuildUrl(string scheme, string host, string basePath)
 
             int? port = null;
 
-            if (!String.IsNullOrEmpty(host) && host.Contains(":"))
+#if NETSTANDARD2_1_OR_GREATER
+            if (!String.IsNullOrEmpty(host) && host.Contains(':', StringComparison.OrdinalIgnoreCase))
+#else
+            if (!String.IsNullOrEmpty(host) && host.Contains(':'))
+#endif
             {
                 var pieces = host.Split(':');
                 host = pieces.First();
diff --git a/test/Microsoft.OpenApi.SmokeTests/ApiGurus.cs b/test/Microsoft.OpenApi.SmokeTests/ApiGurus.cs
index 55a32ff71..2e2b622a8 100644
--- a/test/Microsoft.OpenApi.SmokeTests/ApiGurus.cs
+++ b/test/Microsoft.OpenApi.SmokeTests/ApiGurus.cs
@@ -93,7 +93,7 @@ public async Task EnsureThatICouldParse(string url)
             if (diagnostic.Errors.Count > 0)
             {
                 _output.WriteLine($"Errors parsing {url}");
-                _output.WriteLine(String.Join("\n", diagnostic.Errors));
+                _output.WriteLine(String.Join('\n', diagnostic.Errors));
                 //               Assert.True(false);  // Uncomment to identify descriptions with errors.
             }
 
diff --git a/test/Microsoft.OpenApi.SmokeTests/GraphTests.cs b/test/Microsoft.OpenApi.SmokeTests/GraphTests.cs
index 1aa84662d..24a3a5498 100644
--- a/test/Microsoft.OpenApi.SmokeTests/GraphTests.cs
+++ b/test/Microsoft.OpenApi.SmokeTests/GraphTests.cs
@@ -43,7 +43,7 @@ public GraphTests(ITestOutputHelper output)
             if (diagnostic.Errors.Count > 0)
             {
                 _output.WriteLine($"Errors parsing");
-                _output.WriteLine(String.Join("\n", diagnostic.Errors));
+                _output.WriteLine(String.Join('\n', diagnostic.Errors));
                 //               Assert.True(false);  // Uncomment to identify descriptions with errors.
             }
 
diff --git a/test/Microsoft.OpenApi.Tests/StringExtensions.cs b/test/Microsoft.OpenApi.Tests/StringExtensions.cs
index 5b01c97ac..dfbec23bc 100644
--- a/test/Microsoft.OpenApi.Tests/StringExtensions.cs
+++ b/test/Microsoft.OpenApi.Tests/StringExtensions.cs
@@ -17,7 +17,7 @@ public static class StringExtensions
         public static string MakeLineBreaksEnvironmentNeutral(this string input)
         {
             return input.Replace("\r\n", "\n")
-                .Replace("\r", "\n")
+                .Replace('\r', '\n')
                 .Replace("\n", Environment.NewLine);
         }
     }