diff --git a/bukkit0/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_0.java b/bukkit0/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_0.java
index 5288b7a9..3e627425 100644
--- a/bukkit0/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_0.java
+++ b/bukkit0/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_0.java
@@ -190,11 +190,11 @@ public abstract class BukkitQueue_0<CHUNK, CHUNKSECTIONS, SECTION> extends NMSMa
     }
 
     @Override
-    public FaweChunk getChunk(final int x, final int z) {
+    public FaweChunk getChunk(int x, int z) {
         return new CharFaweChunk<Chunk>(this, x, z) {
             @Override
             public Chunk getNewChunk() {
-                return getWorld().getChunkAt(x, z);
+                return BukkitQueue_0.this.getWorld().getChunkAt(getX(), getZ());
             }
         };
     }
diff --git a/bukkit18/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitQueue18R3.java b/bukkit18/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitQueue18R3.java
index 473ac061..a1546389 100644
--- a/bukkit18/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitQueue18R3.java
+++ b/bukkit18/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitQueue18R3.java
@@ -133,16 +133,13 @@ public class BukkitQueue18R3 extends BukkitQueue_0<Chunk, ChunkSection[], char[]
                     continue;
                 }
                 char[] currentArray = section.getIdArray();
-                boolean fill = true;
                 int solid = 0;
                 for (int k = 0; k < newArray.length; k++) {
                     char n = newArray[k];
                     switch (n) {
                         case 0:
-                            fill = false;
                             continue;
                         case 1:
-                            fill = false;
                             if (currentArray[k] > 1) {
                                 solid++;
                             }
@@ -155,9 +152,6 @@ public class BukkitQueue18R3 extends BukkitQueue_0<Chunk, ChunkSection[], char[]
                     }
                 }
                 setCount(0, solid, section);
-                if (fill) {
-                    fs.setCount(j, Short.MAX_VALUE);
-                }
             }
 //            // Clear
         } catch (Throwable e) {
@@ -205,7 +199,7 @@ public class BukkitQueue18R3 extends BukkitQueue_0<Chunk, ChunkSection[], char[]
         int view = Bukkit.getViewDistance();
         for (FawePlayer fp : Fawe.get().getCachedPlayers()) {
             BukkitPlayer bukkitPlayer = (BukkitPlayer) fp;
-            if (!bukkitPlayer.getWorld().equals(world)) {
+            if (!bukkitPlayer.parent.getWorld().equals(world)) {
                 continue;
             }
             net.minecraft.server.v1_8_R3.EntityPlayer nmsPlayer = ((CraftPlayer) bukkitPlayer.parent).getHandle();
diff --git a/bukkit19/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitChunk_1_9.java b/bukkit19/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitChunk_1_9.java
index 8f78bf2f..3854f6e3 100644
--- a/bukkit19/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitChunk_1_9.java
+++ b/bukkit19/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitChunk_1_9.java
@@ -11,7 +11,6 @@ import net.minecraft.server.v1_9_R1.DataPalette;
 import net.minecraft.server.v1_9_R1.DataPaletteBlock;
 import net.minecraft.server.v1_9_R1.DataPaletteGlobal;
 import net.minecraft.server.v1_9_R1.IBlockData;
-import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 
 public class BukkitChunk_1_9 extends CharFaweChunk<Chunk> {
@@ -31,7 +30,7 @@ public class BukkitChunk_1_9 extends CharFaweChunk<Chunk> {
 
     @Override
     public Chunk getNewChunk() {
-        return Bukkit.getWorld(getParent().world).getChunkAt(getX(), getZ());
+        return ((BukkitQueue_1_9_R1) getParent()).getWorld().getChunkAt(getX(), getZ());
     }
 
     @Override
diff --git a/sponge/src/main/java/com/boydti/fawe/sponge/v1_8/SpongeQueue_1_8.java b/sponge/src/main/java/com/boydti/fawe/sponge/v1_8/SpongeQueue_1_8.java
index 016cf1c3..ed37998e 100644
--- a/sponge/src/main/java/com/boydti/fawe/sponge/v1_8/SpongeQueue_1_8.java
+++ b/sponge/src/main/java/com/boydti/fawe/sponge/v1_8/SpongeQueue_1_8.java
@@ -57,9 +57,7 @@ public class SpongeQueue_1_8 extends NMSMappedFaweQueue<World, net.minecraft.wor
             }
             NetHandlerPlayServer con = nmsPlayer.playerNetServerHandler;
             net.minecraft.world.chunk.Chunk  nmsChunk = (net.minecraft.world.chunk.Chunk) chunk;
-            con.sendPacket(new S21PacketChunkData(nmsChunk, false, 65535));
-            // Try sending true, 0 first
-            // Try bulk chunk packet
+            con.sendPacket(new S21PacketChunkData(chunk, false, 65535));
         }
     }