diff --git a/paper-server/patches/sources/net/minecraft/world/item/component/ResolvableProfile.java.patch b/paper-server/patches/sources/net/minecraft/world/item/component/ResolvableProfile.java.patch
index 9eea0cb419..7d874011f1 100644
--- a/paper-server/patches/sources/net/minecraft/world/item/component/ResolvableProfile.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/item/component/ResolvableProfile.java.patch
@@ -17,7 +17,7 @@
              Optional<GameProfile> optional;
              if (this.id.isPresent()) {
 -                optional = SkullBlockEntity.fetchGameProfile(this.id.get()).getNow(null);
-+                optional = SkullBlockEntity.fetchGameProfile(this.id.get(), this.name.orElse(null)).getNow(null); // Paper
++                optional = SkullBlockEntity.fetchGameProfile(this.id.get(), this.name.orElse(null)).getNow(null); // Paper - player profile events - pass name
              } else {
                  optional = SkullBlockEntity.fetchGameProfile(this.name.orElseThrow()).getNow(null);
              }
@@ -26,7 +26,7 @@
          } else {
              return this.id.isPresent()
 -                ? SkullBlockEntity.fetchGameProfile(this.id.get()).thenApply(this::createProfile)
-+                ? SkullBlockEntity.fetchGameProfile(this.id.get(), this.name.orElse(null)).thenApply(this::createProfile) // Paper
++                ? SkullBlockEntity.fetchGameProfile(this.id.get(), this.name.orElse(null)).thenApply(this::createProfile)  // Paper - player profile events - pass name
                  : SkullBlockEntity.fetchGameProfile(this.name.orElseThrow()).thenApply(this::createProfile);
          }
      }
diff --git a/paper-server/patches/sources/net/minecraft/world/level/GameRules.java.patch b/paper-server/patches/sources/net/minecraft/world/level/GameRules.java.patch
index f09fea5819..49bef8c203 100644
--- a/paper-server/patches/sources/net/minecraft/world/level/GameRules.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/level/GameRules.java.patch
@@ -70,7 +70,7 @@
      );
      public static final GameRules.Key<GameRules.BooleanValue> RULE_LOCATOR_BAR = register(
 -        "locatorBar", GameRules.Category.PLAYER, GameRules.BooleanValue.create(true, (server, value) -> server.getAllLevels().forEach(level -> {
-+        "locatorBar", GameRules.Category.PLAYER, GameRules.BooleanValue.create(true, (server, value) -> java.util.Optional.of(server).ifPresent(level -> { // Paper
++        "locatorBar", GameRules.Category.PLAYER, GameRules.BooleanValue.create(true, (server, value) -> java.util.Optional.of(server).ifPresent(level -> { // Paper - per world game rules
              ServerWaypointManager waypointManager = level.getWaypointManager();
              if (value.get()) {
                  level.players().forEach(waypointManager::updatePlayer);