diff --git a/Spigot-Server-Patches/Add-exception-reporting-event.patch b/Spigot-Server-Patches/Add-exception-reporting-event.patch
index 202b0a787..06eab5268 100644
--- a/Spigot-Server-Patches/Add-exception-reporting-event.patch
+++ b/Spigot-Server-Patches/Add-exception-reporting-event.patch
@@ -247,8 +247,8 @@ diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
-@@ -0,0 +0,0 @@ import java.util.List;
- import java.util.Random;
+@@ -0,0 +0,0 @@ import java.util.Random;
+ import java.util.Set;
  
  // CraftBukkit start
 +import com.destroystokyo.paper.exception.ServerInternalException;
diff --git a/Spigot-Server-Patches/Lighting-Queue.patch b/Spigot-Server-Patches/Lighting-Queue.patch
index d3a6827ae..66f46e364 100644
--- a/Spigot-Server-Patches/Lighting-Queue.patch
+++ b/Spigot-Server-Patches/Lighting-Queue.patch
@@ -3,6 +3,7 @@ From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 00:52:31 -0600
 Subject: [PATCH] Lighting Queue
 
+This provides option to queue lighting updates to ensure they do not cause the server lag
 
 diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
diff --git a/Spigot-Server-Patches/Timings-v2.patch b/Spigot-Server-Patches/Timings-v2.patch
index e8c72195c..792910506 100644
--- a/Spigot-Server-Patches/Timings-v2.patch
+++ b/Spigot-Server-Patches/Timings-v2.patch
@@ -468,9 +468,9 @@ diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -0,0 +0,0 @@ import org.apache.logging.log4j.Logger;
- import org.bukkit.Bukkit;
+@@ -0,0 +0,0 @@ import org.bukkit.Bukkit;
  import org.bukkit.craftbukkit.CraftServer;
+ import org.bukkit.craftbukkit.Main;
  // CraftBukkit end
 -import org.bukkit.craftbukkit.SpigotTimings; // Spigot
 +import co.aikar.timings.MinecraftTimings; // Paper
diff --git a/work/Bukkit b/work/Bukkit
index 19b3d5ef4..e73ec6b83 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 19b3d5ef4cd3cc4cef246dd9dba02199e19f5daf
+Subproject commit e73ec6b833d245ce3c984d6da1cccb22fbe9f3e5
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 301db84d3..7f9fbe54b 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 301db84d3d85f5218f3ec590224071c04140bbe2
+Subproject commit 7f9fbe54baf0e73dc6a9a1ff58d67f82881507a4
diff --git a/work/Spigot b/work/Spigot
index 979715128..078e2f8b3 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 9797151286c045686e3d09389353431efcc6034a
+Subproject commit 078e2f8b3c4d46cfc88cef5a0818891aeca78a2e