diff --git a/Spigot-API-Patches/Timings-v2.patch b/Spigot-API-Patches/Timings-v2.patch
index 9229ca9b8a..3156c70ade 100644
--- a/Spigot-API-Patches/Timings-v2.patch
+++ b/Spigot-API-Patches/Timings-v2.patch
@@ -2944,8 +2944,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
       */
      public boolean register(String label, String fallbackPrefix, Command command) {
 +        command.timings = co.aikar.timings.TimingsManager.getCommandTiming(fallbackPrefix, command); // Spigot
-         label = label.toLowerCase().trim();
-         fallbackPrefix = fallbackPrefix.toLowerCase().trim();
+         label = label.toLowerCase(java.util.Locale.ENGLISH).trim();
+         fallbackPrefix = fallbackPrefix.toLowerCase(java.util.Locale.ENGLISH).trim();
          boolean registered = register(label, command, false, fallbackPrefix);
 @@ -0,0 +0,0 @@ public class SimpleCommandMap implements CommandMap {
              return false;
@@ -3252,7 +3252,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          if (result != null) {
              plugins.add(result);
 -            lookupNames.put(result.getDescription().getName(), result);
-+            lookupNames.put(result.getDescription().getName().toLowerCase(), result); // Spigot
++            lookupNames.put(result.getDescription().getName().toLowerCase(java.util.Locale.ENGLISH), result); // Spigot
          }
  
          return result;
@@ -3261,7 +3261,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
       */
      public synchronized Plugin getPlugin(String name) {
 -        return lookupNames.get(name.replace(' ', '_'));
-+        return lookupNames.get(name.replace(' ', '_').toLowerCase()); // Spigot
++        return lookupNames.get(name.replace(' ', '_').toLowerCase(java.util.Locale.ENGLISH)); // Spigot
      }
  
      public synchronized Plugin[] getPlugins() {
diff --git a/work/Bukkit b/work/Bukkit
index c3a46c9b8d..f0973327a9 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit c3a46c9b8db54daf9425d73aa593e494f809bbde
+Subproject commit f0973327a93ed495f86e96a3e32bc5678b66a15d
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 568e27fbd0..0ebb9c7afa 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 568e27fbd08cf5717ff23f01cc57c37f83ec8218
+Subproject commit 0ebb9c7afa7b79222b7f6ec5fffcaa0aa41de7b9
diff --git a/work/Spigot b/work/Spigot
index 687a0190ef..5391d732ff 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 687a0190ef59611cca4cba981e17b4881c51df17
+Subproject commit 5391d732ffc9118bda74005a22e90efd749b3983