diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EntityHumanNPC.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EntityHumanNPC.java
index 4b63c2cc1..6c15e7a5e 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EntityHumanNPC.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/EntityHumanNPC.java
@@ -141,9 +141,10 @@ public class EntityHumanNPC extends ServerPlayer implements NPCHolder, Skinnable
         Bukkit.getScheduler().runTaskLater(CitizensAPI.getPlugin(), new Runnable() {
             @Override
             public void run() {
+                EntityHumanNPC.this.getLevel().removePlayerImmediately(EntityHumanNPC.this, RemovalReason.KILLED);
                 ((ServerLevel) level).getChunkProvider().removeEntity(EntityHumanNPC.this);
             }
-        }, 35); // give enough time for death and smoke animation
+        }, 15); // give enough time for death and smoke animation
     }
 
     @Override
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/PlayerPathfinder.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/PlayerPathfinder.java
index 065114f5f..74bddc33c 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/PlayerPathfinder.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/PlayerPathfinder.java
@@ -30,16 +30,18 @@ public class PlayerPathfinder extends PathFinder {
     private final int maxVisitedNodes;
     private final Node[] neighbors = new Node[32];
     private final PlayerNodeEvaluator nodeEvaluator;
-    private final BinaryHeap openSet = new BinaryHeap();
+    private final BinaryHeap openSet;
 
     public PlayerPathfinder() {
         super(null, 768);
         this.nodeEvaluator = new PlayerNodeEvaluator();
+        this.openSet = new BinaryHeap();
         this.maxVisitedNodes = 768;
     }
 
     public PlayerPathfinder(PlayerNodeEvaluator var0, int var1) {
         super(var0, var1);
+        this.openSet = new BinaryHeap();
         this.nodeEvaluator = var0;
         this.maxVisitedNodes = var1;
     }