diff --git a/Tactical/Turn Based Input.cpp b/Tactical/Turn Based Input.cpp
index db258a7b..ad89e17c 100644
--- a/Tactical/Turn Based Input.cpp	
+++ b/Tactical/Turn Based Input.cpp	
@@ -6887,7 +6887,7 @@ void SwapMercPortraits ( SOLDIERTYPE *pSoldier, INT8 bDirection )
 	if( pSoldier->flags.uiStatusFlags & ( SOLDIER_DRIVER | SOLDIER_PASSENGER ) )
 	{
 		SOLDIERTYPE *pVehicle = GetSoldierStructureForVehicle( pSoldier->iVehicleId );
-		if( pVehicle != NULL && bNewPosition < gNewVehicle[pVehicle->bVehicleID].iNewSeatingCapacities )
+		if( pVehicle != NULL && bNewPosition < gNewVehicle[ pVehicleList[ pVehicle->bVehicleID ].ubVehicleType ].iNewSeatingCapacities )
 		{
 			if( SwapVehicleSeat( pVehicle, pSoldier, bNewPosition ) )
 			{
diff --git a/TileEngine/structure.cpp b/TileEngine/structure.cpp
index 0bbafd17..af027541 100644
--- a/TileEngine/structure.cpp
+++ b/TileEngine/structure.cpp
@@ -742,7 +742,7 @@ BOOLEAN OkayToAddStructureToTile( INT32 sBaseGridNo, INT16 sCubeOffset, DB_STRUC
 						{
 							pExistingStructure = pExistingStructure->pNext;
 							// damage people when driving on them
-							if( fAddingForReal && ( MercPtrs[ sSoldierID ]->flags.fPastXDest || MercPtrs[ sSoldierID ]->flags.fPastYDest ) )
+							if( fAddingForReal )
 							{	
 								if( TANK( MercPtrs[ sSoldierID ] ) )
 								{