diff --git a/src/Common/src/System/Net/WebSockets/ManagedWebSocket.cs b/src/Common/src/System/Net/WebSockets/ManagedWebSocket.cs
index 86c5ba9e50ae..728788743adf 100644
--- a/src/Common/src/System/Net/WebSockets/ManagedWebSocket.cs
+++ b/src/Common/src/System/Net/WebSockets/ManagedWebSocket.cs
@@ -1262,7 +1262,7 @@ private static unsafe int ApplyMask(Span<byte> toMask, int mask, int maskIndex)
             Debug.Assert(maskIndex < sizeof(int));
 
             int maskShift = maskIndex * 8;
-            int shiftedMask = (int)(((uint)mask >> maskShift) | ((uint)mask << (32 - maskShift)));
+            int shiftedMask = (int)BitOperations.RotateRight((uint)mask, maskShift);
 
             // Try to use SIMD.  We can if the number of bytes we're trying to mask is at least as much
             // as the width of a vector and if the width is an even multiple of the mask.
diff --git a/src/System.Reflection.Metadata/src/System/Reflection/Metadata/Ecma335/MetadataSizes.cs b/src/System.Reflection.Metadata/src/System/Reflection/Metadata/Ecma335/MetadataSizes.cs
index 34c3df341d01..a5d15d64807b 100644
--- a/src/System.Reflection.Metadata/src/System/Reflection/Metadata/Ecma335/MetadataSizes.cs
+++ b/src/System.Reflection.Metadata/src/System/Reflection/Metadata/Ecma335/MetadataSizes.cs
@@ -66,12 +66,12 @@ public sealed class MetadataSizes
         public ImmutableArray<int> HeapSizes { get; }
 
         /// <summary>
-        /// Table row counts. 
+        /// Table row counts.
         /// </summary>
         public ImmutableArray<int> RowCounts { get; }
 
         /// <summary>
-        /// External table row counts. 
+        /// External table row counts.
         /// </summary>
         public ImmutableArray<int> ExternalRowCounts { get; }
 
@@ -363,7 +363,7 @@ internal int MetadataHeaderSize
                     MetadataVersionPaddedLength +  // metadata version
                     sizeof(ushort) +               // storage header: reserved
                     sizeof(ushort) +               // stream count
-                    (IsStandaloneDebugMetadata ? StandalonePdbStreamHeaderSize : 0) + 
+                    (IsStandaloneDebugMetadata ? StandalonePdbStreamHeaderSize : 0) +
                     RegularStreamHeaderSizes +
                     (IsEncDelta ? EncDeltaMarkerStreamHeaderSize : 0);
             }
@@ -399,7 +399,7 @@ public int GetAlignedHeapSize(HeapIndex index)
         internal int CalculateTableStreamHeaderSize()
         {
             int result = sizeof(int) +        // Reserved
-                         sizeof(short) +      // Version (major, minor)      
+                         sizeof(short) +      // Version (major, minor)
                          sizeof(byte) +       // Heap index sizes
                          sizeof(byte) +       // Bit width of RowId
                          sizeof(long) +       // Valid table mask
@@ -421,7 +421,7 @@ internal int CalculateTableStreamHeaderSize()
 
         internal int CalculateStandalonePdbStreamSize()
         {
-            int result = 
+            int result =
                 PdbIdSize +                                                         // PDB ID
                 sizeof(int) +                                                       // EntryPoint
                 sizeof(long) +                                                      // ReferencedTypeSystemTables
diff --git a/src/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/PEHeaderBuilder.cs b/src/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/PEHeaderBuilder.cs
index e9abb6225b01..4cb10c2aa611 100644
--- a/src/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/PEHeaderBuilder.cs
+++ b/src/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/PEHeaderBuilder.cs
@@ -98,7 +98,7 @@ public PEHeaderBuilder(
 
         public static PEHeaderBuilder CreateExecutableHeader()
         {
-            return new PEHeaderBuilder(imageCharacteristics : Characteristics.ExecutableImage);
+            return new PEHeaderBuilder(imageCharacteristics: Characteristics.ExecutableImage);
         }
 
         public static PEHeaderBuilder CreateLibraryHeader()
@@ -111,8 +111,8 @@ public static PEHeaderBuilder CreateLibraryHeader()
         internal int ComputeSizeOfPEHeaders(int sectionCount) =>
             PEBuilder.DosHeaderSize +
             PEHeaders.PESignatureSize +
-            CoffHeader.Size + 
-            PEHeader.Size(Is32Bit) + 
+            CoffHeader.Size +
+            PEHeader.Size(Is32Bit) +
             SectionHeader.Size * sectionCount;
     }
-}
\ No newline at end of file
+}