diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cakewars/trackers/GetGoodStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cakewars/trackers/GetGoodStatTracker.java
index b912605b2..ee4242be6 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cakewars/trackers/GetGoodStatTracker.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cakewars/trackers/GetGoodStatTracker.java
@@ -12,7 +12,7 @@ import nautilus.game.arcade.stats.StatTracker;
 public class GetGoodStatTracker extends StatTracker<Game>
 {
 
-	private static final int MIN_FALL_DISTANCE = 24;
+	private static final int MIN_FALL_DISTANCE = 15;
 
 	public GetGoodStatTracker(Game game)
 	{
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cakewars/ui/CakeResourcePage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cakewars/ui/CakeResourcePage.java
index ba91966f8..d73e2fb0f 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cakewars/ui/CakeResourcePage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cakewars/ui/CakeResourcePage.java
@@ -203,7 +203,7 @@ public class CakeResourcePage extends ShopPageBase<ArcadeManager, CakeResourceSh
 			ItemBuilder give = new ItemBuilder(_item.getItemStack());
 			Material material = give.getType();
 
-			if (UtilItem.isWeapon(material) || UtilItem.isTool(material) || UtilItem.isArmor(material))
+			if (UtilItem.isWeapon(material) || UtilItem.isTool(material) || UtilItem.isArmor(material) || material == Material.SHEARS)
 			{
 				give.setUnbreakable(true);
 			}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/capturepoint/CapturePoint.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/capturepoint/CapturePoint.java
index 164a34ccc..72dd5ee75 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/capturepoint/CapturePoint.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/capturepoint/CapturePoint.java
@@ -117,6 +117,7 @@ public class CapturePoint
 
 		// For each team get the team with the non-zero players
 		GameTeam highest = null;
+		int highestPlayers = 0;
 		for (Entry<GameTeam, Integer> entry : playersOnPoint.entrySet())
 		{
 			GameTeam team = entry.getKey();
@@ -129,6 +130,7 @@ public class CapturePoint
 				if (highest == null)
 				{
 					highest = team;
+					highestPlayers = players;
 				}
 				// This means there are 2 teams on the point
 				else
@@ -141,7 +143,13 @@ public class CapturePoint
 		// No one at all is on the point
 		if (highest == null)
 		{
-			return;
+			if (_owner == null)
+			{
+				return;
+			}
+
+			// If the owner isn't null, move the point's progress back
+			highest = _owner;
 		}
 		// Players on the point
 		// Only inform if it has been a while
@@ -165,7 +173,7 @@ public class CapturePoint
 			return;
 		}
 
-		capture(highest);
+		capture(highest, highestPlayers);
 	}
 
 	private void sendMessage(GameTeam team, String message)
@@ -177,7 +185,7 @@ public class CapturePoint
 		});
 	}
 
-	private void capture(GameTeam team)
+	private void capture(GameTeam team, int progress)
 	{
 		// No player has ever stood on the point
 		if (_side == null)
@@ -189,7 +197,7 @@ public class CapturePoint
 		if (_side.equals(team))
 		{
 			// Increase progress
-			_progress++;
+			_progress += progress;
 			display(team, true);
 
 			// Captured
@@ -207,7 +215,7 @@ public class CapturePoint
 				setBeaconColour(null);
 				_side = team;
 				// Recursively call this method now that the first (same team) condition will be true
-				capture(team);
+				capture(team, progress);
 				return;
 			}