diff --git a/client/BattleInterface/CBattleInterface.cpp b/client/BattleInterface/CBattleInterface.cpp
index 65b3ead0a..23dac79dd 100644
--- a/client/BattleInterface/CBattleInterface.cpp
+++ b/client/BattleInterface/CBattleInterface.cpp
@@ -3585,10 +3585,8 @@ std::string CBattleInterface::SiegeHelper::getSiegeName(ui16 what, ui16 additInf
 			{
 			case 5: case 4: case 1: case 6:
 				return prefix + "TPW1.BMP";
-			case 0: case 2: case 3: case 7: case 8:
-				return prefix + "TPWL.BMP";
 			default:
-				return "";
+				return prefix + "TPWL.BMP";
 			}
 		}
 	case 2: //keep
diff --git a/client/GUIClasses.cpp b/client/GUIClasses.cpp
index a2cb37f33..5cc8979b0 100644
--- a/client/GUIClasses.cpp
+++ b/client/GUIClasses.cpp
@@ -5326,16 +5326,12 @@ CUniversityWindow::CUniversityWindow(const CGHeroInstance * _hero, const IMarket
 
 	CIntObject * titlePic = nullptr;
 
-	if ( market->o->ID == Obj::UNIVERSITY ) // this is adventure map university
-		titlePic = new CPicture("UNIVBLDG");
-	else
 	if (market->o->ID == Obj::TOWN)
 		titlePic = new CAnimImage(CGI->townh->towns[ETownType::CONFLUX].clientInfo.buildingsIcons, EBuilding::MAGIC_UNIVERSITY);
 	else
-		tlog0<<"Error: Image for university was not found!\n";//This should not happen
+		titlePic = new CPicture("UNIVBLDG");
 
-	if (titlePic)
-		titlePic->center(Point(232 + pos.x, 76 + pos.y));
+	titlePic->center(Point(232 + pos.x, 76 + pos.y));
 
 	//Clerk speech
 	new CTextBox(CGI->generaltexth->allTexts[603], Rect(24, 129, 413, 70), 0, FONT_SMALL, CENTER, Colors::WHITE);
diff --git a/lib/CGameState.cpp b/lib/CGameState.cpp
index e566a43a5..12af064f9 100644
--- a/lib/CGameState.cpp
+++ b/lib/CGameState.cpp
@@ -1344,6 +1344,7 @@ void CGameState::init(StartInfo * si)
 	}
 	/****************************TOWNS************************************************/
 	tlog4 << "\tTowns";
+	CGTownInstance::universitySkills.clear();
 	for ( int i=0; i<4; i++)
 		CGTownInstance::universitySkills.push_back(14+i);//skills for university
 
diff --git a/lib/CTownHandler.h b/lib/CTownHandler.h
index e1aa2799f..23ba8b263 100644
--- a/lib/CTownHandler.h
+++ b/lib/CTownHandler.h
@@ -102,7 +102,14 @@ public:
 	// Client-only data. Should be moved away from lib
 	struct ClientInfo
 	{
-		struct Point { si32 x; si32 y;};
+		struct Point
+		{
+			si32 x;
+			si32 y;
+
+			template <typename Handler> void serialize(Handler &h, const int version)
+			{ h & x & y; }
+		};
 
 		//icons [fort is present?][build limit reached?] -> index of icon in def files
 		int icons[2][2];
@@ -131,6 +138,8 @@ public:
 		template <typename Handler> void serialize(Handler &h, const int version)
 		{
 			h & icons & musicTheme & townBackground & guildWindow & buildingsIcons & hallBackground & hallSlots & structures;
+			h & advMapVillage & advMapCastle & advMapCapitol;
+			h & siegePrefix & siegePositions & siegeShooter & siegeShooterCropHeight;
 		}
 	} clientInfo;
 
diff --git a/lib/Map/CMap.h b/lib/Map/CMap.h
index 1f6f4822a..81d309eca 100644
--- a/lib/Map/CMap.h
+++ b/lib/Map/CMap.h
@@ -827,6 +827,7 @@ public:
 		h & CGMagi::eyelist;
 		h & CGObelisk::obeliskCount & CGObelisk::visited;
 		h & CGTownInstance::merchantArtifacts;
+		h & CGTownInstance::universitySkills;
 
 		if(!h.saving)
 		{