diff --git a/JA2.suo b/JA2.suo
index 798a2021d..e2daf3e59 100644
Binary files a/JA2.suo and b/JA2.suo differ
diff --git a/Strategic/Map Screen Interface Map.cpp b/Strategic/Map Screen Interface Map.cpp
index 2da8651e6..75bb095fa 100644
--- a/Strategic/Map Screen Interface Map.cpp	
+++ b/Strategic/Map Screen Interface Map.cpp	
@@ -74,9 +74,9 @@ INT32 iZoomY = 0;
 #define VERT_SCROLL 10
 
 // the pop up for helicopter stuff
-#define MAP_HELICOPTER_ETA_POPUP_X				400
-#define MAP_HELICOPTER_ETA_POPUP_Y				250
-#define MAP_HELICOPTER_UPPER_ETA_POPUP_Y		50
+#define MAP_HELICOPTER_ETA_POPUP_X				(400 + iScreenWidthOffset)
+#define MAP_HELICOPTER_ETA_POPUP_Y				(250 + iScreenHeightOffset)
+#define MAP_HELICOPTER_UPPER_ETA_POPUP_Y		(50 + iScreenHeightOffset)
 #define MAP_HELICOPTER_ETA_POPUP_WIDTH			120
 #define MAP_HELICOPTER_ETA_POPUP_HEIGHT			68
 
diff --git a/Tactical/Vehicles.cpp b/Tactical/Vehicles.cpp
index eaeb47cea..bdde236b7 100644
--- a/Tactical/Vehicles.cpp
+++ b/Tactical/Vehicles.cpp
@@ -293,7 +293,8 @@ INT32 AddVehicleToList( INT16 sMapX, INT16 sMapY, INT16 sGridNo, UINT8 ubType )
 
 	if( !pGroup )
 	{
-		if( gfEditMode )
+		// WANNE: Commented the following line, because we got a CTD when skyrider sees his heli in drassen!
+		//if( gfEditMode )
 		{
 			//This is okay, no groups exist, so simply return.
 			return iVehicleIdValue;