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 b647a5249..3b2305d8e 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
@@ -950,7 +950,7 @@ public class ClansManager extends MiniClientPlugin<ClientClan>implements IRelati
 	public void onJoin(PlayerLoginEvent event)
 	{
 		Rank rank = _clientManager.Get(event.getPlayer()).GetRank();
-		if (!event.getPlayer().isWhitelisted() || rank.has(Rank.EVENT))
+		if (!event.getPlayer().isWhitelisted() || !rank.has(Rank.EVENT))
 		{
 			event.setResult(PlayerLoginEvent.Result.KICK_OTHER);
 			// event.setKickMessage("This server is whitelisted!");
diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/potato/PotatoManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/potato/PotatoManager.java
index a45b0bbaa..fe8880d24 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/potato/PotatoManager.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/potato/PotatoManager.java
@@ -29,7 +29,7 @@ import mineplex.game.clans.clans.ClansManager;
 
 public class PotatoManager extends MiniPlugin implements IThrown
 {
-	private static final String POTATO_NAME = C.cGray + "POTATO";
+	private static final String POTATO_NAME = C.cGray + "Potato";
 
 	private ClansManager _clansManager;
 
@@ -49,9 +49,9 @@ public class PotatoManager extends MiniPlugin implements IThrown
 	private void give(Player player, int count)
 	{
 		ItemStack potato = new ItemStack(Material.BAKED_POTATO, count);
-//		ItemMeta meta = potato.getItemMeta();
-//		meta.setDisplayName(POTATO_NAME);
-//		potato.setItemMeta(meta);
+		ItemMeta meta = potato.getItemMeta();
+		meta.setDisplayName(POTATO_NAME);
+		potato.setItemMeta(meta);
 		player.getInventory().addItem(potato);
 	}
 
diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/fire/Fire.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/fire/Fire.java
index afe05620a..4f51c650c 100644
--- a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/fire/Fire.java
+++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/fire/Fire.java
@@ -110,11 +110,12 @@ public class Fire extends MiniPlugin
 
 		if (!_fire.containsKey(fire))
 			return;
+		
+		event.setCancelled(true);
 
 		if (!_fire.get(fire).canHitOwner() && _fire.get(fire).GetOwner().equals(player))
 			return;
 
-		event.setCancelled(true);
 		
 		if (((CraftPlayer)player).getHandle().spectating)
 			return;