diff --git a/plugin.yml b/plugin.yml
index 578238ac..aaa8ab4b 100644
--- a/plugin.yml
+++ b/plugin.yml
@@ -2,7 +2,7 @@ name: Factions
 version: 1.7_dev
 main: com.massivecraft.factions.P
 authors: [Olof Larsson, Brett Flannigan]
-softdepend: [PermissionsEx, Permissions, Essentials, EssentialsChat, HeroChat, iChat, LocalAreaChat, LWC, nChat, ChatManager, CAPI, AuthMe, Vault, Spout, WorldEdit, WorldGuard]
+softdepend: [PermissionsEx, Permissions, Essentials, EssentialsChat, HeroChat, iChat, LocalAreaChat, LWC, nChat, ChatManager, CAPI, AuthMe, Vault, Spout, WorldEdit, WorldGuard, CaptureThePoints, CombatTag]
 commands:
   factions:
     description: Reference command for Factions.
diff --git a/src/com/massivecraft/factions/FPlayers.java b/src/com/massivecraft/factions/FPlayers.java
index 08952141..186b47a8 100644
--- a/src/com/massivecraft/factions/FPlayers.java
+++ b/src/com/massivecraft/factions/FPlayers.java
@@ -67,7 +67,11 @@ public class FPlayers extends PlayerEntityCollection<FPlayer>
 
 				// if player is faction leader, sort out the faction since he's going away
 				if (fplayer.getRole() == Rel.LEADER)
-					fplayer.getFaction().promoteNewLeader();
+				{
+					Faction faction = fplayer.getFaction();
+					if (faction != null)
+						fplayer.getFaction().promoteNewLeader();
+				}
 
 				fplayer.leave(false);
 				fplayer.detach();
diff --git a/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java b/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java
index 16760a7c..ab79097c 100644
--- a/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java
+++ b/src/com/massivecraft/factions/listeners/FactionsPlayerListener.java
@@ -8,12 +8,12 @@ import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Player;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerBucketEmptyEvent;
 import org.bukkit.event.player.PlayerBucketFillEvent;
 import org.bukkit.event.player.PlayerChatEvent;
-import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerKickEvent;
@@ -229,6 +229,25 @@ public class FactionsPlayerListener extends PlayerListener
 			return;  // only interested on right-clicks for below
 		}
 
+		// workaround fix for new CraftBukkit 1.1-R1 bug where half-step on half-step placement doesn't trigger BlockPlaceEvent
+		if (
+				event.hasItem()
+				&&
+				event.getItem().getType() == Material.STEP
+				&&
+				block.getType() == Material.STEP
+				&&
+				event.getBlockFace() == BlockFace.UP
+				&&
+				event.getItem().getData().getData() == block.getData()
+				&&
+				! FactionsBlockListener.playerCanBuildDestroyBlock(player, block, "build", false)
+			)
+		{
+			event.setCancelled(true);
+			return;
+		}
+
 		if ( ! playerCanUseItemHere(player, block.getLocation(), event.getMaterial(), false))
 		{
 			event.setCancelled(true);