diff --git a/CraftBukkit-Patches/0014-Entity-Activation-Range.patch b/CraftBukkit-Patches/0014-Entity-Activation-Range.patch
index 11385f8c5f..77b9b9ee7f 100644
--- a/CraftBukkit-Patches/0014-Entity-Activation-Range.patch
+++ b/CraftBukkit-Patches/0014-Entity-Activation-Range.patch
@@ -15,9 +15,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@ public abstract class Entity implements ICommandListener {
      public int ticksLived;
      public int maxFireTicks;
-     public int fireTicks; // CraftBukkit - public
+     public int fireTicks;
 -    protected boolean inWater;
-+    public boolean inWater; // Spigot - protected -> public
++    public boolean inWater; // Spigot - protected -> public // PAIL
      public int noDamageTicks;
      protected boolean justCreated;
      protected boolean fireProof;
@@ -25,7 +25,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      private double ar;
      private double as;
 -    public boolean ad;
-+    public boolean ad; public boolean isAddedToChunk() { return ad; } // Spigot
++    public boolean ad; public boolean isAddedToChunk() { return ad; } // Spigot // PAIL
      public int ae;
      public int af;
      public int ag;
@@ -107,7 +107,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public Entity shooter;
 @@ -0,0 +0,0 @@ public class EntityArrow extends Entity implements IProjectile {
      private double damage = 2.0D;
-     public int knockbackStrength; // CraftBukkit - public
+     public int knockbackStrength;
  
 +    // Spigot Start
 +    @Override
@@ -130,7 +130,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +++ b/src/main/java/net/minecraft/server/EntityFireworks.java
 @@ -0,0 +0,0 @@ public class EntityFireworks extends Entity {
      private int ticksFlown;
-     public int expectedLifespan; // CraftBukkit - public
+     public int expectedLifespan;
  
 +    // Spigot Start
 +    @Override
diff --git a/CraftBukkit-Patches/0055-BungeeCord-Support.patch b/CraftBukkit-Patches/0055-BungeeCord-Support.patch
index c82519ce9d..e016a41362 100644
--- a/CraftBukkit-Patches/0055-BungeeCord-Support.patch
+++ b/CraftBukkit-Patches/0055-BungeeCord-Support.patch
@@ -108,9 +108,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {
      private final Queue<NetworkManager.QueuedPacket> i = Queues.newConcurrentLinkedQueue();
      private final ReentrantReadWriteLock j = new ReentrantReadWriteLock();
-     public Channel channel;  // CraftBukkit - public
+     public Channel channel;
 -    private SocketAddress l;
-+    // Spigot Start
++    // Spigot Start // PAIL
 +    public SocketAddress l;
 +    public java.util.UUID spoofedUUID;
 +    public com.mojang.authlib.properties.Property[] spoofedProfile;
diff --git a/CraftBukkit-Patches/0151-Use-Standard-List-for-EntitySlices.patch b/CraftBukkit-Patches/0151-Use-Standard-List-for-EntitySlices.patch
index 7884ec4c09..e19b732d00 100644
--- a/CraftBukkit-Patches/0151-Use-Standard-List-for-EntitySlices.patch
+++ b/CraftBukkit-Patches/0151-Use-Standard-List-for-EntitySlices.patch
@@ -12,7 +12,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public final int locZ;
      private boolean k;
      public final Map<BlockPosition, TileEntity> tileEntities;
--    public final EntitySlice<Entity>[] entitySlices; // CraftBukkit - public
+-    public final EntitySlice<Entity>[] entitySlices;
 +    public final List<Entity>[] entitySlices; // Spigot
      private boolean done;
      private boolean lit;