diff --git a/patches/server/Add-PlayerConnectionCloseEvent.patch b/patches/server/Add-PlayerConnectionCloseEvent.patch
index 45d0c6d036..db993adad9 100644
--- a/patches/server/Add-PlayerConnectionCloseEvent.patch
+++ b/patches/server/Add-PlayerConnectionCloseEvent.patch
@@ -81,3 +81,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      private final String serverId;
      @Nullable
      private ServerPlayer delayedAcceptPlayer;
+@@ -0,0 +0,0 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
+         return new GameProfile(uuid, profile.getName());
+     }
+ 
+-    private static enum State {
++    public static enum State { // Paper - make public
+ 
+         HELLO, KEY, AUTHENTICATING, NEGOTIATING, READY_TO_ACCEPT, DELAY_ACCEPT, ACCEPTED;
+ 
diff --git a/patches/server/Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/patches/server/Don-t-check-ConvertSigns-boolean-every-sign-save.patch
index 156166a0eb..c7658cee0c 100644
--- a/patches/server/Don-t-check-ConvertSigns-boolean-every-sign-save.patch
+++ b/patches/server/Don-t-check-ConvertSigns-boolean-every-sign-save.patch
@@ -10,12 +10,14 @@ diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntit
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
-@@ -0,0 +0,0 @@
- package net.minecraft.world.level.block.entity;
+@@ -0,0 +0,0 @@ import net.minecraft.world.phys.Vec2;
+ import net.minecraft.world.phys.Vec3;
+ 
+ public class SignBlockEntity extends BlockEntity implements CommandSource { // CraftBukkit - implements
 +    private static final boolean CONVERT_LEGACY_SIGNS = Boolean.getBoolean("convertLegacySigns"); // Paper
  
- import com.mojang.brigadier.exceptions.CommandSyntaxException;
- import java.util.UUID;
+     public static final int LINES = 4;
+     private static final String[] RAW_TEXT_FIELD_NAMES = new String[]{"Text1", "Text2", "Text3", "Text4"};
 @@ -0,0 +0,0 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
          }