diff --git a/CI/msvc/before_install.sh b/CI/msvc/before_install.sh
index 1a040d421..5388e84f8 100644
--- a/CI/msvc/before_install.sh
+++ b/CI/msvc/before_install.sh
@@ -5,3 +5,6 @@ curl -LfsS -o "vcpkg-export-${VCMI_BUILD_PLATFORM}-windows-v143.7z" \
 #rm -r -f vcpkg/installed/${VCMI_BUILD_PLATFORM}-windows/debug
 #mkdir -p vcpkg/installed/${VCMI_BUILD_PLATFORM}-windows/debug/bin
 #cp vcpkg/installed/${VCMI_BUILD_PLATFORM}-windows/bin/* vcpkg/installed/${VCMI_BUILD_PLATFORM}-windows/debug/bin
+
+DUMPBIN_DIR=$(vswhere -latest -find **/dumpbin.exe | head -n 1)
+dirname "$DUMPBIN_DIR" > $GITHUB_PATH
diff --git a/lib/battle/BattleInfo.cpp b/lib/battle/BattleInfo.cpp
index 401a656d2..5bbebc49c 100644
--- a/lib/battle/BattleInfo.cpp
+++ b/lib/battle/BattleInfo.cpp
@@ -209,7 +209,7 @@ BattleInfo * BattleInfo::setupBattle(const int3 & tile, TerrainId terrain, const
 	}
 
 	//randomize obstacles
-	if (layout.obstaclesAllowed)
+	if (layout.obstaclesAllowed && !town)
  	{
 		RandGen r{};
 		auto ourRand = [&](){ return r.rand(); };
diff --git a/lib/mapObjects/CreatureBank.cpp b/lib/mapObjects/CreatureBank.cpp
deleted file mode 100644
index e69de29bb..000000000
diff --git a/lib/mapObjects/CreatureBank.h b/lib/mapObjects/CreatureBank.h
deleted file mode 100644
index e69de29bb..000000000