diff --git a/CraftBukkit-Patches/0149-Limit-block-placement-interaction-packets.patch b/CraftBukkit-Patches/0149-Limit-block-placement-interaction-packets.patch
index ba0cdcd7e..9092ebfb9 100644
--- a/CraftBukkit-Patches/0149-Limit-block-placement-interaction-packets.patch
+++ b/CraftBukkit-Patches/0149-Limit-block-placement-interaction-packets.patch
@@ -14,14 +14,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
 +    // Spigot start - limit place/interactions
 +    private long lastPlace = -1;
++    private int packets = 0;
 +
      public void a(PacketPlayInBlockPlace packetplayinblockplace) {
 +        boolean throttled = false;
-+        if (lastPlace != -1 && packetplayinblockplace.timestamp - lastPlace < 5) {
++        if (lastPlace != -1 && packetplayinblockplace.timestamp - lastPlace < 30 && packets++ >= 4) {
 +            throttled = true;
-+        } else
++        } else if ( packetplayinblockplace.timestamp - lastPlace >= 30 || lastPlace == -1 )
 +        {
 +            lastPlace = packetplayinblockplace.timestamp;
++            packets = 0;
 +        }
 +    // Spigot end
          WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
diff --git a/CraftBukkit-Patches/0154-Safer-JSON-Loading.patch b/CraftBukkit-Patches/0154-Safer-JSON-Loading.patch
index 25a924356..04d9d08c3 100644
--- a/CraftBukkit-Patches/0154-Safer-JSON-Loading.patch
+++ b/CraftBukkit-Patches/0154-Safer-JSON-Loading.patch
@@ -15,10 +15,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        // Spigot Start
 +        } catch ( java.io.FileNotFoundException ex )
 +        {
-+            org.bukkit.Bukkit.getLogger().log( java.util.logging.Level.INFO, "Unable to find file {0}, creating it.", this.c );
++            a.info( "Unable to find file {0}, creating it.", this.c );
 +        } catch ( net.minecraft.util.com.google.gson.JsonSyntaxException ex )
 +        {
-+            org.bukkit.Bukkit.getLogger().log( java.util.logging.Level.WARNING, "Unable to read file {0}, backing it up to {0}.backup and creating new copy.", this.c );
++            a.warn( "Unable to read file {0}, backing it up to {0}.backup and creating new copy.", this.c );
 +            File backup = new File( this.c + ".backup" );
 +            this.c.renameTo( backup );
 +            this.c.delete();
@@ -36,7 +36,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  ;
 +            // Spigot Start
 +            } catch (net.minecraft.util.com.google.gson.JsonSyntaxException ex) {
-+                org.bukkit.Bukkit.getLogger().warning( "Usercache.json is corrupted or has bad formatting. Deleting it to prevent further issues.");
++                JsonList.a.warn( "Usercache.json is corrupted or has bad formatting. Deleting it to prevent further issues." );
 +                this.g.delete();
 +            // Spigot End
              } finally {
diff --git a/Spigot-Server-Patches/Toggle-for-player-interact-limiter.patch b/Spigot-Server-Patches/Toggle-for-player-interact-limiter.patch
index 1cca3ece0..3363ff9fe 100644
--- a/Spigot-Server-Patches/Toggle-for-player-interact-limiter.patch
+++ b/Spigot-Server-Patches/Toggle-for-player-interact-limiter.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Zach Brown <1254957+zachbr@users.noreply.github.com>
-Date: Wed, 16 Jul 2014 14:11:08 -0500
+Date: Thu, 24 Jul 2014 22:19:44 -0500
 Subject: [PATCH] Toggle for player interact limiter
 
 
@@ -21,10 +21,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
      public void a(PacketPlayInBlockPlace packetplayinblockplace) {
          boolean throttled = false;
--        if (lastPlace != -1 && packetplayinblockplace.timestamp - lastPlace < 5) {
-+        if (lastPlace != -1 && packetplayinblockplace.timestamp - lastPlace < 5 && PaperSpigotConfig.interactLimitEnabled) {
+-        if (lastPlace != -1 && packetplayinblockplace.timestamp - lastPlace < 30 && packets++ >= 4) {
++        if (PaperSpigotConfig.interactLimitEnabled && lastPlace != -1 && packetplayinblockplace.timestamp - lastPlace < 30 && packets++ >= 4) {
              throttled = true;
-         } else
+         } else if ( packetplayinblockplace.timestamp - lastPlace >= 30 || lastPlace == -1 )
          {
 diff --git a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644