diff --git a/src/com/massivecraft/factions/integration/capi/CapiFeatures.java b/src/com/massivecraft/factions/integration/capi/CapiFeatures.java
index 96095d9d..f50c09ad 100644
--- a/src/com/massivecraft/factions/integration/capi/CapiFeatures.java
+++ b/src/com/massivecraft/factions/integration/capi/CapiFeatures.java
@@ -12,7 +12,7 @@ public class CapiFeatures
 	public static void setup()
 	{
 		Plugin plug = Bukkit.getServer().getPluginManager().getPlugin("capi");
-		if (plug != null && plug.getClass().getName().equals("com.massivecraft.capi.capi"))
+		if (plug != null && plug.getClass().getName().equals("com.massivecraft.capi.P"))
 		{
 			P.p.log("Integration with the CAPI plugin was successful");
 			P.p.registerEvent(Event.Type.CUSTOM_EVENT, new PluginCapiListener(P.p), Priority.Normal);
diff --git a/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java b/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java
index 439b2e41..544c3687 100644
--- a/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java
+++ b/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java
@@ -168,11 +168,11 @@ public class FactionsPlayerListener extends PlayerListener
 	@Override
 	public void onPlayerMove(PlayerMoveEvent event)
 	{
-		Player player = event.getPlayer();
-		FPlayer me = FPlayers.i.get(player);
-		
 		// Did we change block?
 		if (event.getFrom().equals(event.getTo())) return;
+				
+		Player player = event.getPlayer();
+		FPlayer me = FPlayers.i.get(player);
 		
 		// Did we change coord?
 		FLocation from = me.getLastStoodAt();