diff --git a/src/main/java/net/citizensnpcs/Citizens.java b/src/main/java/net/citizensnpcs/Citizens.java
index a93045c14..271b4c9db 100644
--- a/src/main/java/net/citizensnpcs/Citizens.java
+++ b/src/main/java/net/citizensnpcs/Citizens.java
@@ -330,13 +330,13 @@ public class Citizens extends JavaPlugin implements CitizensPlugin {
     }
 
     private void scheduleSaveTask(int delay) {
-        Bukkit.getScheduler().scheduleSyncDelayedTask(this, new Runnable() {
+        Bukkit.getScheduler().scheduleSyncRepeatingTask(this, new Runnable() {
             @Override
             public void run() {
                 storeNPCs();
                 saves.saveToDisk();
             }
-        });
+        }, delay, delay);
     }
 
     private void setupEconomy() {
@@ -418,8 +418,9 @@ public class Citizens extends JavaPlugin implements CitizensPlugin {
         boolean async = args.hasFlag('a');
         if (async) {
             saves.saveToDisk();
-        } else
+        } else {
             saves.saveToDiskImmediate();
+        }
     }
 
     private boolean suggestClosestModifier(CommandSender sender, String command, String modifier) {
diff --git a/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java b/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java
index f7730bb3d..b57fb51f3 100644
--- a/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java
+++ b/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java
@@ -39,7 +39,7 @@ public class MCTargetStrategy implements PathStrategy, EntityTarget {
         this.target = ((CraftEntity) target).getHandle();
         Navigation nav = NMS.getNavigation(this.handle);
         this.targetNavigator = nav != null && !params.useNewPathfinder() ? new NavigationFieldWrapper(nav)
-        : new AStarTargeter();
+                : new AStarTargeter();
         this.aggro = aggro;
     }
 
@@ -162,7 +162,7 @@ public class MCTargetStrategy implements PathStrategy, EntityTarget {
         private void setStrategy() {
             Location location = target.getBukkitEntity().getLocation(TARGET_LOCATION);
             strategy = npc.isFlyable() ? new FlyingAStarNavigationStrategy(npc, location, parameters)
-            : new AStarNavigationStrategy(npc, location, parameters);
+                    : new AStarNavigationStrategy(npc, location, parameters);
         }
 
         @Override