diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cakewars/shop/CakeTeamItem.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cakewars/shop/CakeTeamItem.java
index 4ca5b9369..ada2479f7 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cakewars/shop/CakeTeamItem.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cakewars/shop/CakeTeamItem.java
@@ -2,6 +2,7 @@ package nautilus.game.arcade.game.games.cakewars.shop;
 
 import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftMetaBanner;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
@@ -32,7 +33,7 @@ public enum CakeTeamItem implements CakeItem
 				{
 					for (ItemStack itemStack : player.getInventory().getArmorContents())
 					{
-						if (UtilItem.isArmor(itemStack) && !itemStack.containsEnchantment(Enchantment.PROTECTION_ENVIRONMENTAL))
+						if (UtilItem.isArmor(itemStack) && itemStack.getEnchantmentLevel(Enchantment.PROTECTION_ENVIRONMENTAL) < level)
 						{
 							itemStack.addUnsafeEnchantment(Enchantment.PROTECTION_ENVIRONMENTAL, level);
 						}
@@ -66,7 +67,7 @@ public enum CakeTeamItem implements CakeItem
 				{
 					for (ItemStack itemStack : player.getInventory().getContents())
 					{
-						if (UtilItem.isSword(itemStack) && !itemStack.containsEnchantment(Enchantment.DAMAGE_ALL))
+						if (UtilItem.isSword(itemStack) && itemStack.getEnchantmentLevel(Enchantment.DAMAGE_ALL) < level)
 						{
 							itemStack.addUnsafeEnchantment(Enchantment.DAMAGE_ALL, level);
 						}
@@ -86,7 +87,7 @@ public enum CakeTeamItem implements CakeItem
 				{
 					for (ItemStack itemStack : player.getInventory().getContents())
 					{
-						if (itemStack != null && itemStack.getType() == Material.BOW && !itemStack.containsEnchantment(Enchantment.ARROW_DAMAGE))
+						if (itemStack != null && itemStack.getType() == Material.BOW && itemStack.getEnchantmentLevel(Enchantment.ARROW_DAMAGE) < level)
 						{
 							itemStack.addUnsafeEnchantment(Enchantment.ARROW_DAMAGE, level);
 						}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/voting/Vote.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/voting/Vote.java
index 94a586440..1d7e89b24 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/voting/Vote.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/voting/Vote.java
@@ -34,7 +34,7 @@ public abstract class Vote<T extends Voteable>
 		}
 	}
 
-	private static final int VOTE_TIME = 30;
+	private static final int VOTE_TIME = 20;
 
 	private final ArcadeManager _manager;
 	private final String _name;