diff --git a/Tactical/DisplayCover.cpp b/Tactical/DisplayCover.cpp
index 44545a16..2c075f9c 100644
--- a/Tactical/DisplayCover.cpp
+++ b/Tactical/DisplayCover.cpp
@@ -1007,7 +1007,7 @@ void CalculateMines()
 	BOOLEAN fWithMineDetector = FALSE;
 	if ( pSoldier && gubDrawModeMine == MINES_DRAW_DETECT_ENEMY )
 	{
-		if ( FindMetalDetectorInHand(pSoldier) )
+		if ( FindMetalDetectorInHand(pSoldier) != NO_SLOT )
 			fWithMineDetector = TRUE;
 
 		// TODO: perhaps even consume batteries one day...
diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp
index 132d93c6..aef1fb9a 100644
--- a/Tactical/Items.cpp
+++ b/Tactical/Items.cpp
@@ -8018,11 +8018,14 @@ BOOLEAN ArmBomb( OBJECTTYPE * pObj, INT8 bSetting )
 		else
 			ubWireNetworkFlag |= TRIPWIRE_NETWORK_NET_4;
 
+		// sevenfm: fixed incorrect hierarchy calculation
+		if(netnr == 0)
+			hierarchytimesfour -= 4;
 		if ( 0 == hierarchytimesfour )
 			ubWireNetworkFlag |= TRIPWIRE_NETWORK_LVL_1;
-		else if ( 1 == hierarchytimesfour )
+		else if ( 4 == hierarchytimesfour )
 			ubWireNetworkFlag |= TRIPWIRE_NETWORK_LVL_2;
-		else if ( 2 == hierarchytimesfour )
+		else if ( 8 == hierarchytimesfour )
 			ubWireNetworkFlag |= TRIPWIRE_NETWORK_LVL_3;
 		else
 			ubWireNetworkFlag |= TRIPWIRE_NETWORK_LVL_4;