diff --git a/CraftBukkit-Patches/0043-Allow-Disabling-of-1.6.3-Structure-Saving.patch b/CraftBukkit-Patches/0043-Allow-Disabling-of-1.6.3-Structure-Saving.patch
index 8f788c992e..aa81898ccc 100644
--- a/CraftBukkit-Patches/0043-Allow-Disabling-of-1.6.3-Structure-Saving.patch
+++ b/CraftBukkit-Patches/0043-Allow-Disabling-of-1.6.3-Structure-Saving.patch
@@ -1,4 +1,4 @@
-From 7bc859e1e7ba2ac758032adca239c0c242e10e17 Mon Sep 17 00:00:00 2001
+From 0286ff7e5e60203d14187bf3f779c192738e98b9 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 21 Sep 2013 12:33:09 +1000
 Subject: [PATCH] Allow Disabling of 1.6.3 Structure Saving
@@ -25,7 +25,7 @@ index 49b7aa1..ecab5d1 100644
                  this.d = new PersistentStructure(this.a());
                  world.a(this.a(), (PersistentBase) this.d);
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 8868ea3..48ae475 100644
+index 8868ea3..0d5c9d0 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -186,4 +186,16 @@ public class SpigotWorldConfig
@@ -40,7 +40,7 @@ index 8868ea3..48ae475 100644
 +        log( "Structure Info Saving: " + saveStructureInfo );
 +        if ( !saveStructureInfo )
 +        {
-+            log( "*** WARNING *** You have selected to NOT save structure info. This may cause structures such as fortresses to not spawn mobs when updating to 1.7!" );
++            log( "*** WARNING *** You have selected to NOT save structure info. This may cause structures such as fortresses to not spawn mobs!" );
 +            log( "*** WARNING *** Please use this option with caution, SpigotMC is not responsible for any issues this option may cause in the future!" );
 +        }
 +    }
diff --git a/CraftBukkit-Patches/0053-Orebfuscator.patch b/CraftBukkit-Patches/0053-Orebfuscator.patch
index a76e2688f9..902777b1c7 100644
--- a/CraftBukkit-Patches/0053-Orebfuscator.patch
+++ b/CraftBukkit-Patches/0053-Orebfuscator.patch
@@ -1,4 +1,4 @@
-From 8b4bf455ad97f5e8945d8ffc23270728c028bae8 Mon Sep 17 00:00:00 2001
+From 361e6e27db460279006522e3b5571ad25c52aac1 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 16 May 2013 18:51:05 +1000
 Subject: [PATCH] Orebfuscator
@@ -25,10 +25,10 @@ index 22dc42d..fd78677 100644
                              if (block instanceof BlockFalling) {
                                  ((BlockFalling) block).a_(this.world, blockposition);
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index 5ce4985..735a7d4 100644
+index 58951a7..e49c0a5 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
-@@ -195,6 +195,7 @@ public class Explosion {
+@@ -198,6 +198,7 @@ public class Explosion {
                  blockposition = (BlockPosition) iterator.next();
                  Block block = this.world.getType(blockposition).getBlock();
  
@@ -362,7 +362,7 @@ index 0000000..6f28cd8
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 1814b4f..45b2aae 100644
+index af0c4b2..c390381 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -1,5 +1,6 @@