diff --git a/patches/server/Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/Call-player-spectator-target-events-and-improve-impl.patch
index 3f6f685f4a..a00162d522 100644
--- a/patches/server/Call-player-spectator-target-events-and-improve-impl.patch
+++ b/patches/server/Call-player-spectator-target-events-and-improve-impl.patch
@@ -93,8 +93,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          }
      }
  
--    private void a(List<TextFilter.FilteredText> list, UnaryOperator<String> unaryoperator, ItemStack itemstack, int slot, ItemStack old) { // CraftBukkit
-+    public void a(List<TextFilter.FilteredText> list, UnaryOperator<String> unaryoperator, ItemStack itemstack, int slot, ItemStack old) { // CraftBukkit // Paper - make public
+-    private void a(List<TextFilter.FilteredText> list, UnaryOperator<String> unaryoperator, ItemStack itemstack, int slot, ItemStack handItem) { // CraftBukkit
++    public void a(List<TextFilter.FilteredText> list, UnaryOperator<String> unaryoperator, ItemStack itemstack, int slot, ItemStack handItem) { // CraftBukkit // Paper - make public
          ListTag nbttaglist = new ListTag();
  
          if (this.player.isTextFilteringEnabled()) {
diff --git a/patches/server/Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/Don-t-ignore-result-of-PlayerEditBookEvent.patch
index 019ada27a5..706116c0eb 100644
--- a/patches/server/Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/Don-t-ignore-result-of-PlayerEditBookEvent.patch
@@ -12,8 +12,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          }
  
          itemstack.addTagElement("pages", (Tag) nbttaglist);
--        CraftEventFactory.handleEditBookEvent(player, slot, old, itemstack); // CraftBukkit
-+        this.player.containerMenu.setItem(slot, CraftEventFactory.handleEditBookEvent(player, slot, old, itemstack)); // CraftBukkit // Paper - Don't ignore result (see other callsite for handleEditBookEvent)
+-        CraftEventFactory.handleEditBookEvent(player, slot, handItem, itemstack); // CraftBukkit
++        this.player.containerMenu.setItem(slot, CraftEventFactory.handleEditBookEvent(player, slot, handItem, itemstack)); // CraftBukkit // Paper - Don't ignore result (see other callsite for handleEditBookEvent)
      }
  
      @Override
diff --git a/work/Bukkit b/work/Bukkit
index a791f93de2..ebb0e28d11 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit a791f93de242bf89d116fed843b889e38433e094
+Subproject commit ebb0e28d11747aa0bb4bb39fad8979ccfaa925b6
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 85b8c1fda6..622cf61119 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 85b8c1fda69f6f80e45ddd19590846c249e5b6bc
+Subproject commit 622cf6111905e787add191b9a88d62656439ef31