diff --git a/src/com/projectkorra/projectkorra/earthbending/passive/FerroControl.java b/src/com/projectkorra/projectkorra/earthbending/passive/FerroControl.java
index 49553b8b..00d6e945 100644
--- a/src/com/projectkorra/projectkorra/earthbending/passive/FerroControl.java
+++ b/src/com/projectkorra/projectkorra/earthbending/passive/FerroControl.java
@@ -21,6 +21,7 @@ public class FerroControl extends MetalAbility implements PassiveAbility {
 	public FerroControl(final Player player) {
 		super(player);
 
+		start();
 	}
 
 	@Override
@@ -59,6 +60,7 @@ public class FerroControl extends MetalAbility implements PassiveAbility {
 			this.block.getWorld().playSound(this.block.getLocation(), Sound.valueOf(sound), 0.5f, 0);
 			this.bPlayer.addCooldown(this, 200);
 		}
+		remove();
 	}
 
 	@Override
@@ -88,7 +90,7 @@ public class FerroControl extends MetalAbility implements PassiveAbility {
 
 	@Override
 	public boolean isInstantiable() {
-		return true;
+		return false;
 	}
 
 	@Override
diff --git a/src/com/projectkorra/projectkorra/waterbending/passive/FastSwim.java b/src/com/projectkorra/projectkorra/waterbending/passive/FastSwim.java
index de4b7372..7c27e459 100644
--- a/src/com/projectkorra/projectkorra/waterbending/passive/FastSwim.java
+++ b/src/com/projectkorra/projectkorra/waterbending/passive/FastSwim.java
@@ -26,11 +26,14 @@ public class FastSwim extends WaterAbility implements PassiveAbility {
 		this.cooldown = ConfigManager.getConfig().getLong("Abilities.Water.Passive.FastSwim.Cooldown");
 		this.swimSpeed = ConfigManager.getConfig().getDouble("Abilities.Water.Passive.FastSwim.SpeedFactor");
 		this.duration = ConfigManager.getConfig().getLong("Abilities.Water.Passive.FastSwim.Duration");
+		
+		start();
 	}
 
 	@Override
 	public void progress() {
 		if (!this.bPlayer.canUsePassive(this) || !this.bPlayer.canBendPassive(this) || CoreAbility.hasAbility(this.player, WaterSpout.class) || CoreAbility.hasAbility(this.player, EarthArmor.class) || CoreAbility.hasAbility(this.player, WaterArms.class)) {
+			remove();
 			return;
 		}
 
@@ -38,11 +41,13 @@ public class FastSwim extends WaterAbility implements PassiveAbility {
 			if (this.player.isSneaking() && ElementalAbility.isWater(this.player.getLocation().getBlock()) && !this.bPlayer.isOnCooldown(this)) {
 				if (this.duration != 0 && System.currentTimeMillis() > this.getStartTime() + this.duration) {
 					this.bPlayer.addCooldown(this);
+					remove();
 					return;
 				}
 				this.player.setVelocity(this.player.getEyeLocation().getDirection().clone().normalize().multiply(this.swimSpeed));
 			} else if (!this.player.isSneaking()) {
 				this.bPlayer.addCooldown(this);
+				remove();
 			}
 		}
 	}
@@ -78,7 +83,7 @@ public class FastSwim extends WaterAbility implements PassiveAbility {
 
 	@Override
 	public boolean isInstantiable() {
-		return true;
+		return false;
 	}
 
 	@Override