diff --git a/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/MDCScope.java b/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/MDCScope.java
index 8e8ae138f46e7..34471463a96ce 100644
--- a/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/MDCScope.java
+++ b/extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/MDCScope.java
@@ -58,7 +58,7 @@ public Span span() {
 
     protected void putContext(JaegerSpanContext spanContext) {
         MDC.put(TRACE_ID, spanContext.getTraceId());
-        MDC.put(SPAN_ID, String.format("%16x", spanContext.getSpanId()));
+        MDC.put(SPAN_ID, Long.toHexString(spanContext.getSpanId()));
         MDC.put(SAMPLED, Boolean.toString(spanContext.isSampled()));
     }
 }
diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AbstractSharedContext.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AbstractSharedContext.java
index 3436a5bb13e24..1a25c07926bbb 100644
--- a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AbstractSharedContext.java
+++ b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/impl/AbstractSharedContext.java
@@ -116,6 +116,10 @@ public boolean equals(Object obj) {
                 return false;
             }
             Key other = (Key) obj;
+            // Shortcut removes hotspot on contextual.equals
+            if (contextual == other.contextual) {
+                return true;
+            }
             if (!contextual.equals(other.contextual)) {
                 return false;
             }