diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
index 214707cd7..ce3ff1b86 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
@@ -49,7 +49,7 @@ import net.minecraft.server.v1_8_R3.MinecraftServer;
 
 public class Clans extends JavaPlugin
 {
-	public static final String VERSION = "0.17";
+	public static final String VERSION = "0.17b";
 	private String WEB_CONFIG = "webServer";
 
 	// Modules
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java
index eea8309b6..9d06f8fa4 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java
@@ -656,6 +656,10 @@ public class ClansDataAccessLayer
 	{
 		final Timestamp currentTime = new Timestamp(System.currentTimeMillis());
 		final ClanWarData war = new ClanWarData(clanA.getName(), clanB.getName(), score, currentTime, currentTime, 0);
+
+		// Memory
+		clanA.addWar(war);
+		clanB.addWar(war);
 		
 		runAsync(new Runnable()
 		{
@@ -669,10 +673,6 @@ public class ClansDataAccessLayer
 					@Override
 					public void run()
 					{
-						// Memory
-						clanA.addWar(war);
-						clanB.addWar(war);
-						
 						_manager.log("Initiator war for [" + clanA.getName() + "] against [" + clanB.getName() + "].");
 						
 						if (warCallback != null) warCallback.run(war);
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
index 8b09f8db2..d97ad7c78 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
@@ -305,7 +305,7 @@ public class ClansManager extends MiniClientPlugin<ClientClan>implements IRelati
 			loadClan(token);
 		}
 		
-		new ClaimVisualizer(plugin, this);
+//		new ClaimVisualizer(plugin, this);
 		
 		// RedisDataRepository(ConnectionData writeConn, ConnectionData
 		// readConn, Region region, Class<T> elementType, String elementLabel)
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/HeavyArrowsAttribute.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/HeavyArrowsAttribute.java
index 16aa30a21..f5e55d42c 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/HeavyArrowsAttribute.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/attributes/bow/HeavyArrowsAttribute.java
@@ -35,6 +35,7 @@ public class HeavyArrowsAttribute extends ItemAttribute
 	@Override
 	public void onAttack(CustomDamageEvent event)
 	{
-		event.AddKnockback("HeavyAttribute", _knockbackPercent);
+		double knockback = (_knockbackPercent / 100d) * 6;
+		event.AddKnockback("Heavy Attribute", knockback);
 	}
 }
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/spawn/Spawn.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/spawn/Spawn.java
index dfca12bb5..50a251707 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/spawn/Spawn.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/spawn/Spawn.java
@@ -248,7 +248,7 @@ public class Spawn extends MiniPlugin
 		
 		if (isInSpawn(player))
 		{
-			UtilPlayer.message(event.GetPlayer(), F.main("Safe Zone", "You cannot use " + F.skill(event.GetSkillName() + " in " + F.elem("Safe Zone") + ".")));
+			UtilPlayer.message(event.GetPlayer(), F.main("Safe Zone", "You cannot use " + F.skill(event.GetSkillName()) + " in " + F.elem("Safe Zone") + "."));
 			event.SetCancelled(true);
 		}
 	}
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskLeaveSpawn.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskLeaveSpawn.java
index 37bea2964..5f0f7926c 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskLeaveSpawn.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskLeaveSpawn.java
@@ -33,6 +33,7 @@ public class TaskLeaveSpawn extends TutorialTask<TutorialGettingStarted>
 		if (player.getLocation().getY() < 100)
 		{
 			finishFor(player);
+			_inTask.remove(player.getName());
 		}
 	}
 	
@@ -50,7 +51,7 @@ public class TaskLeaveSpawn extends TutorialTask<TutorialGettingStarted>
 			String playerName = iterator.next();
 			Player player = UtilPlayer.searchExact(playerName);
 			
-			if (player.getLocation().getY() < 100 && getClans().getClanUtility().getClaim(player.getLocation()) == null)
+			if (player != null && player.getLocation().getY() < 100 && getClans().getClanUtility().getClaim(player.getLocation()) == null)
 			{
 				finishFor(player);
 				iterator.remove();