diff --git a/CraftBukkit-Patches/0013-Spigot-Timings.patch b/CraftBukkit-Patches/0013-Spigot-Timings.patch
index f712b1275d..1b5ce7f43f 100644
--- a/CraftBukkit-Patches/0013-Spigot-Timings.patch
+++ b/CraftBukkit-Patches/0013-Spigot-Timings.patch
@@ -274,6 +274,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
          this.methodProfiler.a("tallying");
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
+ 
+         this.methodProfiler.b();
+         this.methodProfiler.b();
++        SpigotTimings.serverTickTimer.stopTiming(); // Spigot
++        org.spigotmc.CustomTimingsHandler.tick(); // Spigot
+     }
+ 
      public void v() {
          this.methodProfiler.a("levels");
  
@@ -355,11 +362,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        SpigotTimings.tickablesTimer.stopTiming(); // Spigot
  
          this.methodProfiler.b();
-+        SpigotTimings.serverTickTimer.stopTiming(); // Spigot
-+        org.spigotmc.CustomTimingsHandler.tick(); // Spigot
      }
- 
-     public boolean getAllowNether() {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
diff --git a/CraftBukkit-Patches/0055-Watchdog-Thread.patch b/CraftBukkit-Patches/0055-Watchdog-Thread.patch
index 5ae3e5ab63..db801179dc 100644
--- a/CraftBukkit-Patches/0055-Watchdog-Thread.patch
+++ b/CraftBukkit-Patches/0055-Watchdog-Thread.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
-Date: Sat, 23 Feb 2013 12:33:20 +1100
+Date: Tue, 5 Aug 2014 17:20:19 +0100
 Subject: [PATCH] Watchdog Thread.
 
 
@@ -17,9 +17,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  this.isStopped = true;
              } catch (Throwable throwable1) {
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
-         SpigotTimings.tickablesTimer.stopTiming(); // Spigot
  
          this.methodProfiler.b();
+         this.methodProfiler.b();
 +        org.spigotmc.WatchdogThread.tick(); // Spigot
          SpigotTimings.serverTickTimer.stopTiming(); // Spigot
          org.spigotmc.CustomTimingsHandler.tick(); // Spigot
diff --git a/CraftBukkit-Patches/0069-Particle-API.patch b/CraftBukkit-Patches/0069-Particle-API.patch
index d737e579dd..27d7e2a1d1 100644
--- a/CraftBukkit-Patches/0069-Particle-API.patch
+++ b/CraftBukkit-Patches/0069-Particle-API.patch
@@ -78,7 +78,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            {
 +                StringBuilder particleFullName = new StringBuilder();
 +                particleFullName.append( effect.getName() );
-+                if ( effect.getData() != null && ( effect.getData().equals( Material.class ) || effect.getData().equals( org.bukkit.material.MaterialData.class ) ) )
++                if ( effect.getData() != null && ( effect.getData().equals( org.bukkit.Material.class ) || effect.getData().equals( org.bukkit.material.MaterialData.class ) ) )
 +                {
 +                    particleFullName.append( '_' ).append( id );
 +                }