diff --git a/CMakeLists.txt b/CMakeLists.txt
index d7ba93bafb2..c24705e51e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,9 +38,10 @@ endif()
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
 
 # Configure build options for compatibility with commodity CPUs
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=x86-64 -mtune=generic -mno-avx -mno-sse4")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=x86-64 -mtune=generic -mno-avx -mno-sse4")
-
+if(NOT MSVC)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=x86-64 -mtune=generic -mno-avx -mno-sse4")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=x86-64 -mtune=generic -mno-avx -mno-sse4")
+endif()
 
 # *****************************************************************************
 # Include cmake tools
diff --git a/data/libs/systems/zones.lua b/data/libs/systems/zones.lua
index 698a464fe87..a232a071f41 100644
--- a/data/libs/systems/zones.lua
+++ b/data/libs/systems/zones.lua
@@ -15,12 +15,24 @@ function Zone:randomPosition()
 		logger.error("Zone:randomPosition() - Zone {} has no positions", self:getName())
 		return nil
 	end
-	local destination = positions[math.random(1, #positions)]
-	local tile = destination:getTile()
-	while not tile or not tile:isWalkable(false, false, false, false, true) do
-		destination = positions[math.random(1, #positions)]
-		tile = destination:getTile()
+
+	local validPositions = {}
+	for _, position in ipairs(positions) do
+		local tile = position:getTile()
+		if tile and tile:isWalkable(false, false, false, false, true) then
+			table.insert(validPositions, position)
+		else
+			logger.debug("Zone:randomPosition() - Position {} is invalid (Tile: {}, Walkable: {})", position, tile or "nil", tile and tile:isWalkable(false, false, false, false, true) or "false")
+		end
 	end
+
+	if #validPositions == 0 then
+		logger.error("Zone:randomPosition() - No valid positions in Zone {}", self:getName())
+		return nil
+	end
+
+	local destination = validPositions[math.random(1, #validPositions)]
+	logger.debug("Zone:randomPosition() - Selected valid position: {}", destination)
 	return destination
 end