diff --git a/src/main/java/com/intellectualcrafters/plot/BukkitMain.java b/src/main/java/com/intellectualcrafters/plot/BukkitMain.java
index 51ec62892..ce2c69f9f 100644
--- a/src/main/java/com/intellectualcrafters/plot/BukkitMain.java
+++ b/src/main/java/com/intellectualcrafters/plot/BukkitMain.java
@@ -375,7 +375,7 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
                             case ZOMBIE:
                             default: {
                                 Location loc = entity.getLocation();
-                                if (manager.getPlotIdAbs(pw, loc.getBlockX(), 0, loc.getBlockZ()) == null) {
+                                if (MainUtil.isPlotRoad(BukkitUtil.getLocation(loc))) {
                                     entity.remove();
                                 }
                                 break;
diff --git a/src/main/java/com/intellectualcrafters/plot/object/PlotAnalysis.java b/src/main/java/com/intellectualcrafters/plot/object/PlotAnalysis.java
index 47b37de9d..a59867a98 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/PlotAnalysis.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/PlotAnalysis.java
@@ -167,7 +167,13 @@ public class PlotAnalysis {
                         public void run() {
                             analyzePlot(queuePlot, new RunnableVal<PlotAnalysis>() {
                                 public void run() {
+                                    try {
+                                        wait(10000);
+                                    } catch (InterruptedException e) {
+                                        e.printStackTrace();
+                                    }
                                     synchronized (lock) {
+                                        MainUtil.runners.remove(queuePlot);
                                         lock.notify();
                                     }
                                 }