diff --git a/lib/gson.jar b/lib/gson.jar
new file mode 100644
index 00000000..acd16c06
Binary files /dev/null and b/lib/gson.jar differ
diff --git a/src/com/massivecraft/factions/Conf.java b/src/com/massivecraft/factions/Conf.java
index db8426ee..e955e427 100644
--- a/src/com/massivecraft/factions/Conf.java
+++ b/src/com/massivecraft/factions/Conf.java
@@ -71,7 +71,7 @@ public class Conf {
 	public static double homesTeleportAllowedEnemyDistance = 32;
 	public static boolean homesTeleportIgnoreEnemiesIfInOwnTerritory = true;
 	
-	public static boolean disablePVPBetweenNeutralFaction = false;
+	public static boolean disablePVPBetweenNeutralFactions = false;
 	public static boolean disablePVPForFactionlessPlayers = false;
 	public static int noPVPDamageToOthersForXSecondsAfterLogin = 3;
 	
diff --git a/src/com/massivecraft/factions/FPlayer.java b/src/com/massivecraft/factions/FPlayer.java
index 5488979c..94d3870a 100644
--- a/src/com/massivecraft/factions/FPlayer.java
+++ b/src/com/massivecraft/factions/FPlayer.java
@@ -673,6 +673,10 @@ public class FPlayer {
 	}
 	
 	public static void autoLeaveOnInactivityRoutine() {
+		if (Conf.autoLeaveAfterDaysOfInactivity <= 0.0) {
+			return;
+		}
+
 		long now = System.currentTimeMillis();
 		double toleranceMillis = Conf.autoLeaveAfterDaysOfInactivity * 24 * 60 * 60 * 1000;
 		
diff --git a/src/com/massivecraft/factions/listeners/FactionsEntityListener.java b/src/com/massivecraft/factions/listeners/FactionsEntityListener.java
index 1346a41d..a950bbff 100644
--- a/src/com/massivecraft/factions/listeners/FactionsEntityListener.java
+++ b/src/com/massivecraft/factions/listeners/FactionsEntityListener.java
@@ -189,13 +189,13 @@ public class FactionsEntityListener extends EntityListener {
 		Relation relation = defender.getRelation(attacker);
 		
 		// You can not hurt neutral factions
-		if (relation.isNeutral() && Conf.disablePVPBetweenNeutralFaction) {
-		attacker.sendMessage("You can't hurt neutral factions");
-		return false;
+		if (Conf.disablePVPBetweenNeutralFactions && relation.isNeutral()) {
+			attacker.sendMessage("You can't hurt neutral factions");
+			return false;
 		}
 		
 		// Players without faction may be hurt anywhere
-		if (defender.getFaction().isNone()) {
+		if (!defender.hasFaction()) {
 			return true;
 		}