diff --git a/main/src/main/java/net/citizensnpcs/trait/LookClose.java b/main/src/main/java/net/citizensnpcs/trait/LookClose.java
index fcf3aae1f..9ff4913b1 100644
--- a/main/src/main/java/net/citizensnpcs/trait/LookClose.java
+++ b/main/src/main/java/net/citizensnpcs/trait/LookClose.java
@@ -190,7 +190,7 @@ public class LookClose extends Trait implements Toggleable, CommandConfigurable
         t--;
         if (lookingAt != null && canSeeTarget()) {
             Util.faceEntity(npc.getEntity(), lookingAt);
-            if (npc.getEntity().getType().name().toLowerCase().contains("shulker")) {
+            if (npc.getEntity().getType().name().equals("SHULKER")) {
                 NMS.setPeekShulker(npc.getEntity(), 100 - (int) Math
                         .floor(npc.getStoredLocation().distanceSquared(lookingAt.getLocation(PLAYER_LOCATION))));
             }
diff --git a/main/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java b/main/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java
index 9603220fc..8d88ff122 100644
--- a/main/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java
+++ b/main/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java
@@ -505,13 +505,13 @@ public class LinearWaypointProvider implements EnumerableWaypointProvider {
         }
 
         public void setPaused(boolean pause) {
+            paused = pause;
             if (pause && currentDestination != null) {
                 selector.finish();
                 if (npc != null && npc.getNavigator().isNavigating()) {
                     npc.getNavigator().cancelNavigation();
                 }
             }
-            paused = pause;
         }
 
         @Override
diff --git a/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/DelayTrigger.java b/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/DelayTrigger.java
index 0a7426693..08195a3a2 100644
--- a/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/DelayTrigger.java
+++ b/main/src/main/java/net/citizensnpcs/trait/waypoint/triggers/DelayTrigger.java
@@ -32,11 +32,11 @@ public class DelayTrigger implements WaypointTrigger {
     @Override
     public void onWaypointReached(NPC npc, Location waypoint) {
         if (delay > 0) {
-            scheduleTask(npc.getOrAddTrait(Waypoints.class).getCurrentProvider());
+            delay(npc.getOrAddTrait(Waypoints.class).getCurrentProvider());
         }
     }
 
-    private void scheduleTask(final WaypointProvider provider) {
+    private void delay(final WaypointProvider provider) {
         provider.setPaused(true);
         Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
             @Override