diff --git a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
index 91cbd4a812..f15da1fb7b 100644
--- a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
+++ b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
@@ -191,6 +191,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +    // Spigot end
  }
--- 
-1.9.5.msysgit.0
-
+--
\ No newline at end of file
diff --git a/CraftBukkit-Patches/0026-Implement-SpawnerSpawnEvent.patch b/CraftBukkit-Patches/0026-Implement-SpawnerSpawnEvent.patch
index 3d35a1212e..a4c52371f2 100644
--- a/CraftBukkit-Patches/0026-Implement-SpawnerSpawnEvent.patch
+++ b/CraftBukkit-Patches/0026-Implement-SpawnerSpawnEvent.patch
@@ -50,7 +50,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                      }
 @@ -0,0 +0,0 @@ public abstract class MobSpawnerAbstract {
              }
-         } else if (entity instanceof EntityLiving && entity.world != null && flag) {
+         } else if (entity instanceof EntityInsentient && entity.world != null && flag) { // CraftBukkit - EntityLiving -> EntityInsentient
              ((EntityInsentient) entity).prepare(entity.world.E(new BlockPosition(entity)), (GroupDataEntity) null);
 -            entity.world.addEntity(entity, CreatureSpawnEvent.SpawnReason.SPAWNER); // CraftBukkit
 +            // Spigot start - call SpawnerSpawnEvent, abort if cancelled
diff --git a/CraftBukkit-Patches/0094-Cancellable-WitherSkull-potion-effect.patch b/CraftBukkit-Patches/0094-Cancellable-WitherSkull-potion-effect.patch
index d42cd57b9e..e46e208f6a 100644
--- a/CraftBukkit-Patches/0094-Cancellable-WitherSkull-potion-effect.patch
+++ b/CraftBukkit-Patches/0094-Cancellable-WitherSkull-potion-effect.patch
@@ -13,10 +13,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          if (!this.world.isStatic) {
              if (movingobjectposition.entity != null) {
 +                // Spigot start
-+                boolean didDamage = false;         	
++                boolean didDamage = false;
                  if (this.shooter != null) {
--                    if (movingobjectposition.entity.damageEntity(DamageSource.mobAttack(this.shooter), 8.0F)) {
-+                    didDamage = movingobjectposition.entity.damageEntity(DamageSource.mobAttack(this.shooter), 8.0F);
+-                    if (movingobjectposition.entity.damageEntity(DamageSource.projectile(this, shooter), 8.0F)) { // CraftBukkit
++                    didDamage = movingobjectposition.entity.damageEntity(DamageSource.projectile(this, shooter), 8.0F);
 +                    if (didDamage) {
                          if (!movingobjectposition.entity.isAlive()) {
                              this.shooter.heal(5.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.WITHER); // CraftBukkit