diff --git a/patches/server/Fix-dangerous-end-portal-logic.patch b/patches/server/Fix-dangerous-end-portal-logic.patch
index dd0ee60b6a..96dbe3d64e 100644
--- a/patches/server/Fix-dangerous-end-portal-logic.patch
+++ b/patches/server/Fix-dangerous-end-portal-logic.patch
@@ -31,7 +31,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            return;
 +        }
 +
-+        if (this.isPassenger() || this.isVehicle() || !this.canChangeDimensions() || this.removed || !this.valid || !this.isAlive()) {
++        if (this.isPassenger() || this.isVehicle() || !this.canChangeDimensions() || this.isRemoved() || !this.valid || !this.isAlive()) {
 +            return;
 +        }
 +
diff --git a/patches/server/Fix-invulnerable-end-crystals.patch b/patches/server/Fix-invulnerable-end-crystals.patch
index d8c3090ba7..7e4f09bc32 100644
--- a/patches/server/Fix-invulnerable-end-crystals.patch
+++ b/patches/server/Fix-invulnerable-end-crystals.patch
@@ -49,7 +49,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            // Paper end
          }
  
-+        if (this.generatedByDragonFight) tag.putBoolean("Paper.GeneratedByDragonFight", this.generatedByDragonFight); // Paper - Fix invulnerable end crystals
+     }
+@@ -0,0 +0,0 @@ public class EndCrystal extends Entity {
+         }
+ 
+         nbt.putBoolean("ShowBottom", this.showsBottom());
++        if (this.generatedByDragonFight) nbt.putBoolean("Paper.GeneratedByDragonFight", this.generatedByDragonFight); // Paper - Fix invulnerable end crystals
      }
  
      @Override
@@ -57,7 +62,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          if (nbt.contains("ShowBottom", 1)) {
              this.setShowBottom(nbt.getBoolean("ShowBottom"));
          }
-+        if (tag.contains("Paper.GeneratedByDragonFight", 1)) this.generatedByDragonFight = tag.getBoolean("Paper.GeneratedByDragonFight"); // Paper - Fix invulnerable end crystals
++        if (nbt.contains("Paper.GeneratedByDragonFight", 1)) this.generatedByDragonFight = nbt.getBoolean("Paper.GeneratedByDragonFight"); // Paper - Fix invulnerable end crystals
  
      }
  
diff --git a/patches/server/More-Lidded-Block-API.patch b/patches/server/More-Lidded-Block-API.patch
index 0d370cfd2b..eeef00dd63 100644
--- a/patches/server/More-Lidded-Block-API.patch
+++ b/patches/server/More-Lidded-Block-API.patch
@@ -51,7 +51,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        requirePlaced();
 +        if (!getTileEntity().openersCounter.opened) {
 +            net.minecraft.world.level.Level world = getTileEntity().getLevel();
-+            world.blockEvent(getTileEntity().getBlockPos(), getTileEntity().getBlockState().getBlock(), 1, getTileEntity().getViewerCount() + 1);
++            world.blockEvent(getTileEntity().getBlockPos(), getTileEntity().getBlockState().getBlock(), 1, getTileEntity().openersCounter.getOpenerCount() + 1);
 +            world.playSound(null, getPosition(), net.minecraft.sounds.SoundEvents.ENDER_CHEST_OPEN, net.minecraft.sounds.SoundSource.BLOCKS, 0.5F, world.random.nextFloat() * 0.1F + 0.9F);
 +        }
 +        getTileEntity().openersCounter.opened = true;