diff --git a/Tactical/Interface Panels.cpp b/Tactical/Interface Panels.cpp
index 5febb3e4..3ba5baac 100644
--- a/Tactical/Interface Panels.cpp	
+++ b/Tactical/Interface Panels.cpp	
@@ -6111,7 +6111,6 @@ void MercFacePanelCallback( MOUSE_REGION * pRegion, INT32 iReason )
 		return;
 	}
 
-
 	if (iReason & MSYS_CALLBACK_REASON_INIT)
 	{
 		return;
@@ -6122,6 +6121,10 @@ void MercFacePanelCallback( MOUSE_REGION * pRegion, INT32 iReason )
 		return;
 	}
 
+	if (!OK_INTERRUPT_MERC(MercPtrs[ubSoldierID]))
+	{
+		return;
+	}
 
 	if (iReason & MSYS_CALLBACK_REASON_LBUTTON_DWN)
 	{
diff --git a/Tactical/Weapons.cpp b/Tactical/Weapons.cpp
index f4f84bee..5e12cea1 100644
--- a/Tactical/Weapons.cpp
+++ b/Tactical/Weapons.cpp
@@ -8408,7 +8408,7 @@ UINT32 CalcChanceHTH( SOLDIERTYPE * pAttacker,SOLDIERTYPE *pDefender, INT16 ubAi
 			iAttRating = ( 2 * EffectiveDexterity( pAttacker, FALSE ) + // coordination, accuracy  *
 					 2 * EffectiveAgility( pAttacker, FALSE ) +    // speed & reflexes
 				     pAttacker->stats.bStrength +    // physical strength 
-					 pDefender->bExtraStrength +    // additional strength from power armour
+					 pAttacker->bExtraStrength +    // additional strength from power armour
 					 (10 * EffectiveExpLevel( pAttacker ) ) );  // experience, knowledge
 		}
 		else
@@ -8417,7 +8417,7 @@ UINT32 CalcChanceHTH( SOLDIERTYPE * pAttacker,SOLDIERTYPE *pDefender, INT16 ubAi
 			iAttRating = ( EffectiveDexterity( pAttacker, FALSE ) + // coordination, accuracy
 					 EffectiveAgility( pAttacker, FALSE ) +    // speed & reflexes
 					 3 * pAttacker->stats.bStrength +    // physical strength (TRIPLED!)
-					 3 * pDefender->bExtraStrength +    // additional strength from power armour
+					 3 * pAttacker->bExtraStrength +    // additional strength from power armour
 					 (10 * EffectiveExpLevel( pAttacker ) ) );  // experience, knowledge
 		}
 		///////////////////////////////////////////////////////////////////////////////////////
@@ -8427,7 +8427,7 @@ UINT32 CalcChanceHTH( SOLDIERTYPE * pAttacker,SOLDIERTYPE *pDefender, INT16 ubAi
 		iAttRating = (3 * EffectiveDexterity( pAttacker, FALSE ) + // coordination, accuracy (TRIPLED!)
 				 EffectiveAgility( pAttacker, FALSE ) +    // speed & reflexes
 				 pAttacker->stats.bStrength +    // physical strength
-				 pDefender->bExtraStrength +    // additional strength from power armour
+				 pAttacker->bExtraStrength +    // additional strength from power armour
 				 (10 * EffectiveExpLevel( pAttacker ) ) );  // experience, knowledge
 	}