diff --git a/Strategic/strategicmap.cpp b/Strategic/strategicmap.cpp
index 137bd456..992440f3 100644
--- a/Strategic/strategicmap.cpp
+++ b/Strategic/strategicmap.cpp
@@ -1775,7 +1775,10 @@ BOOLEAN	SetCurrentWorldSector( INT16 sMapX, INT16 sMapY, INT8 bMapZ )
 
 			for (int i=0; i<TOTAL_SOLDIERS; i++)
 			{
-				Assert( !MercPtrs[i]->bActive || !MercPtrs[i]->bInSector || MercPtrs[i]->sGridNo != NOWHERE);
+				//CHRISL: We should only bother with this assertion if the soldier is alive.  Dead soliders are moved to
+				//	GridNo = NOWHERE, which causes this assertion to fail
+				if(!(MercPtrs[i]->flags.uiStatusFlags & SOLDIER_DEAD))
+					Assert( !MercPtrs[i]->bActive || !MercPtrs[i]->bInSector || MercPtrs[i]->sGridNo != NOWHERE );
 			}
 
 			if( gubNumCreaturesAttackingTown && !gbWorldSectorZ &&
@@ -1814,7 +1817,10 @@ BOOLEAN	SetCurrentWorldSector( INT16 sMapX, INT16 sMapY, INT8 bMapZ )
 
 			for (int i=0; i<TOTAL_SOLDIERS; i++)
 			{
-				Assert( !MercPtrs[i]->bActive || !MercPtrs[i]->bInSector || MercPtrs[i]->sGridNo != NOWHERE);
+				//CHRISL: We should only bother with this assertion if the soldier is alive.  Dead soliders are moved to
+				//	GridNo = NOWHERE, which causes this assertion to fail
+				if(!(MercPtrs[i]->flags.uiStatusFlags & SOLDIER_DEAD))
+					Assert( !MercPtrs[i]->bActive || !MercPtrs[i]->bInSector || MercPtrs[i]->sGridNo != NOWHERE);
 			}
 
 			return( TRUE );
diff --git a/Tactical/Soldier Profile.cpp b/Tactical/Soldier Profile.cpp
index f8bea8b7..f7a06ae9 100644
--- a/Tactical/Soldier Profile.cpp	
+++ b/Tactical/Soldier Profile.cpp	
@@ -1016,7 +1016,10 @@ SOLDIERTYPE *ChangeSoldierTeam( SOLDIERTYPE *pSoldier, UINT8 ubTeam )
 			{
 				pNewSoldier->inv[cnt] = pSoldier->inv[cnt];
 			}
-			// Next, try to autoplace everything else
+			// Next, direct copy of the gunsling and knife pockets
+			pNewSoldier->inv[GUNSLINGPOCKPOS] = pSoldier->inv[GUNSLINGPOCKPOS];
+			pNewSoldier->inv[KNIFEPOCKPOS] = pSoldier->inv[KNIFEPOCKPOS];
+			// Then, try to autoplace everything else
 			for(cnt = BIGPOCKSTART; cnt < pNewSoldier->inv.size(); cnt++ )
 			{
 				if(pSoldier->inv[cnt].exists() == true)