diff --git a/src/com/projectkorra/projectkorra/earthbending/EarthArmor.java b/src/com/projectkorra/projectkorra/earthbending/EarthArmor.java
index abcb8818..dcc1fd39 100644
--- a/src/com/projectkorra/projectkorra/earthbending/EarthArmor.java
+++ b/src/com/projectkorra/projectkorra/earthbending/EarthArmor.java
@@ -4,6 +4,7 @@ import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.EarthAbility;
 import com.projectkorra.projectkorra.util.TempBlock;
 import com.projectkorra.projectkorra.util.TempPotionEffect;
+import com.projectkorra.projectkorra.waterbending.PlantArmor;
 
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -42,6 +43,11 @@ public class EarthArmor extends EarthAbility {
 			return;
 		}
 		
+		if (hasAbility(player, PlantArmor.class)) {
+			PlantArmor abil = getAbility(player, PlantArmor.class);
+			abil.remove();
+		}
+		
 		this.formed = false;
 		this.complete = false;
 		this.interval = 2000;
diff --git a/src/com/projectkorra/projectkorra/earthbending/Shockwave.java b/src/com/projectkorra/projectkorra/earthbending/Shockwave.java
index 414b703c..a4053149 100644
--- a/src/com/projectkorra/projectkorra/earthbending/Shockwave.java
+++ b/src/com/projectkorra/projectkorra/earthbending/Shockwave.java
@@ -37,6 +37,7 @@ public class Shockwave extends EarthAbility {
 		
 		if (fall) {
 			fallShockwave();
+			return;
 		}
 		
 		start();
diff --git a/src/com/projectkorra/projectkorra/waterbending/PlantArmor.java b/src/com/projectkorra/projectkorra/waterbending/PlantArmor.java
index 93fcf585..febe4bb4 100644
--- a/src/com/projectkorra/projectkorra/waterbending/PlantArmor.java
+++ b/src/com/projectkorra/projectkorra/waterbending/PlantArmor.java
@@ -2,6 +2,7 @@ package com.projectkorra.projectkorra.waterbending;
 
 import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.PlantAbility;
+import com.projectkorra.projectkorra.earthbending.EarthArmor;
 
 import org.bukkit.Color;
 import org.bukkit.Location;
@@ -43,10 +44,15 @@ public class PlantArmor extends PlantAbility {
 		
 		if (hasAbility(player, PlantArmor.class)) {
 			return;
-		} else if (bPlayer.isOnCooldown(this)) {
+		} else if (!bPlayer.canBend(this)) {
 			return;
 		}
 		
+		if (hasAbility(player, EarthArmor.class)) {
+			EarthArmor abil = getAbility(player, EarthArmor.class);
+			abil.remove();
+		}
+		
 		block = getPlantSourceBlock(player, range, true);
 		if (block == null) {
 			return;