diff --git a/src/coreclr/nativeaot/Runtime/arm/GcProbe.S b/src/coreclr/nativeaot/Runtime/arm/GcProbe.S
index f4729629137c0c..f8057c299e8c20 100644
--- a/src/coreclr/nativeaot/Runtime/arm/GcProbe.S
+++ b/src/coreclr/nativeaot/Runtime/arm/GcProbe.S
@@ -92,9 +92,9 @@
 .endm
 
 NESTED_ENTRY RhpWaitForGC, _TEXT, NoHandler
-    PUSH_PROBE_FRAME r2, r3, r12
+    PUSH_PROBE_FRAME r3, r2, r12
 
-    ldr         r0, [r2, #OFFSETOF__Thread__m_pDeferredTransitionFrame]
+    ldr         r0, [r3, #OFFSETOF__Thread__m_pDeferredTransitionFrame]
     bl          RhpWaitForGC2
 
     POP_PROBE_FRAME
@@ -124,7 +124,6 @@ NESTED_ENTRY RhpGcProbeHijack, _TEXT, NoHandler
     bne         LOCAL_LABEL(WaitForGC)
     bx          lr
 LOCAL_LABEL(WaitForGC):
-    mov         r2, r3                  // Move thread pointer to r2 for RhpWaitForGC
     mov         r12, #(DEFAULT_FRAME_SAVE_FLAGS + PTFF_SAVE_R0 + PTFF_SAVE_R1 + PTFF_SAVE_R2)
     orr         r12, r12, #PTFF_THREAD_HIJACK
     b           RhpWaitForGC
diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/System.Private.CoreLib.csproj b/src/coreclr/nativeaot/System.Private.CoreLib/src/System.Private.CoreLib.csproj
index bc3aaef2046d2f..0e20f7f99303c0 100644
--- a/src/coreclr/nativeaot/System.Private.CoreLib/src/System.Private.CoreLib.csproj
+++ b/src/coreclr/nativeaot/System.Private.CoreLib/src/System.Private.CoreLib.csproj
@@ -1,4 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Features>$(Features);runtime-async=on</Features>
+  </PropertyGroup>
+
   <PropertyGroup>
     <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
   </PropertyGroup>
diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index 46da7b2e28340f..73e36cf5b0035b 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -99,4 +99,9 @@
     <CoverageIncludeDirectory Include="shared\Microsoft.NETCore.App\$(ProductVersion)" />
   </ItemGroup>
 
+  <PropertyGroup Condition="'$(UseNativeAotCoreLib)' == 'true'">
+    <Features>$(Features);runtime-async=on</Features>
+    <NoWarn>$(NoWarn);xUnit1013;CS1998;SYSLIB5007</NoWarn>
+  </PropertyGroup>
+
 </Project>