diff --git a/patches/api/Improve-entity-effect-API.patch b/patches/api/Improve-entity-effect-API.patch
index 0277e12f49..1312775fe2 100644
--- a/patches/api/Improve-entity-effect-API.patch
+++ b/patches/api/Improve-entity-effect-API.patch
@@ -97,6 +97,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * creaking heart.
 +     */
 +    @MinecraftExperimental(MinecraftExperimental.Requires.WINTER_DROP)
++    @org.jetbrains.annotations.ApiStatus.Experimental
 +    SHAKE(66, org.bukkit.entity.CreakingTransient.class);
 +    // Paper end - add missing EntityEffect
  
diff --git a/patches/server/Fix-possible-StackOverflowError-and-NPE-for-some-dis.patch b/patches/server/Fix-possible-StackOverflowError-and-NPE-for-some-dis.patch
index b653a09256..2aea153c00 100644
--- a/patches/server/Fix-possible-StackOverflowError-and-NPE-for-some-dis.patch
+++ b/patches/server/Fix-possible-StackOverflowError-and-NPE-for-some-dis.patch
@@ -73,7 +73,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                        DispenseItemBehavior idispensebehavior = (DispenseItemBehavior) DispenserBlock.DISPENSER_REGISTRY.get(eventStack.getItem());
 -                        if (idispensebehavior != DispenseItemBehavior.NOOP && idispensebehavior != EquipmentDispenseItemBehavior.INSTANCE) {
 +                        DispenseItemBehavior idispensebehavior = DispenserBlock.getDispenseBehavior(pointer, eventStack); // Paper - Fix NPE with equippable and items without behavior
-+                        if (idispensebehavior != DispenseItemBehavior.NOOP && idispensebehavior != EquipmentDispenseItemBehavior.INSTANCE && idispensebehavior != this) { // Paper - fix possible StackOverflowError
++                        if (idispensebehavior != DispenseItemBehavior.NOOP && idispensebehavior != this) { // Paper - fix possible StackOverflowError
                              idispensebehavior.dispense(pointer, eventStack);
                              return stack;
                          }
@@ -84,7 +84,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                    DispenseItemBehavior idispensebehavior = (DispenseItemBehavior) DispenserBlock.DISPENSER_REGISTRY.get(eventStack.getItem());
 -                    if (idispensebehavior != DispenseItemBehavior.NOOP && idispensebehavior != EquipmentDispenseItemBehavior.INSTANCE) {
 +                    DispenseItemBehavior idispensebehavior = DispenserBlock.getDispenseBehavior(pointer, eventStack); // Paper - Fix NPE with equippable and items without behavior
-+                    if (idispensebehavior != DispenseItemBehavior.NOOP && idispensebehavior != EquipmentDispenseItemBehavior.INSTANCE && idispensebehavior != this) { // Paper - fix possible StackOverflowError
++                    if (idispensebehavior != DispenseItemBehavior.NOOP && idispensebehavior != this) { // Paper - fix possible StackOverflowError
                          idispensebehavior.dispense(pointer, eventStack);
                          return stack;
                      }
@@ -185,7 +185,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                        DispenseItemBehavior idispensebehavior = (DispenseItemBehavior) DispenserBlock.DISPENSER_REGISTRY.get(eventStack.getItem());
 -                        if (idispensebehavior != DispenseItemBehavior.NOOP && idispensebehavior != EquipmentDispenseItemBehavior.INSTANCE) {
 +                        DispenseItemBehavior idispensebehavior = DispenserBlock.getDispenseBehavior(pointer, eventStack); // Paper - Fix NPE with equippable and items without behavior
-+                        if (idispensebehavior != DispenseItemBehavior.NOOP && idispensebehavior != EquipmentDispenseItemBehavior.INSTANCE && idispensebehavior != this) { // Paper - fix possible StackOverflowError
++                        if (idispensebehavior != DispenseItemBehavior.NOOP && idispensebehavior != this) { // Paper - fix possible StackOverflowError
                              idispensebehavior.dispense(pointer, eventStack);
                              return stack;
                          }