diff --git a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
index 9eadcc9dcc4..1b804c4f943 100644
--- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
@@ -383,8 +383,6 @@ int LIR_Assembler::emit_unwind_handler() {
 
   int offset = code_offset();
 
-  __ block_comment("Emit unwind handler");
-
   // Fetch the exception from TLS and clear out exception related thread state
   __ ldr(r0, Address(rthread, JavaThread::exception_oop_offset()));
   __ str(zr, Address(rthread, JavaThread::exception_oop_offset()));
@@ -2663,7 +2661,7 @@ void LIR_Assembler::increment_profile_ctr(LIR_Opr step, LIR_Opr dest_opr, LIR_Op
   };
 
   if (counter_stub != nullptr) {
-    __ ubfx(rscratch1, r_profile_rng, 28 - ratio_shift, ratio_shift);
+    __ ubfx(rscratch1, r_profile_rng, 32 - ratio_shift, ratio_shift);
     __ cbz(rscratch1, *counter_stub->entry());
     __ bind(*counter_stub->continuation());
     __ step_random(r_profile_rng, rscratch2);
diff --git a/src/hotspot/share/c1/c1_Compilation.cpp b/src/hotspot/share/c1/c1_Compilation.cpp
index 148aaf5b4fd..368cf604eeb 100644
--- a/src/hotspot/share/c1/c1_Compilation.cpp
+++ b/src/hotspot/share/c1/c1_Compilation.cpp
@@ -294,7 +294,7 @@ void Compilation::emit_code_epilog(LIR_Assembler* assembler) {
     return;
   }
 
-  // generate code for slow cases
+  // generate code or slow cases
   assembler->emit_slow_case_stubs();
   CHECK_BAILOUT();
 
@@ -363,6 +363,7 @@ int Compilation::emit_code_body() {
   return frame_map()->framesize();
 }
 
+
 int Compilation::compile_java_method() {
   assert(!method()->is_native(), "should not reach here");
 
@@ -387,6 +388,7 @@ int Compilation::compile_java_method() {
     BAILOUT_("Bailing out because of -XX:+BailoutAfterHIR", no_frame_size);
   }
 
+
   {
     PhaseTraceTime timeit(_t_emit_lir);