diff --git a/engine/server/server.h b/engine/server/server.h
index f8fb8def..e9465d3e 100644
--- a/engine/server/server.h
+++ b/engine/server/server.h
@@ -615,7 +615,7 @@ void SV_EmptyStringPool( void );
 void SV_PrintStr64Stats_f( void );
 #endif
 sv_client_t *SV_ClientFromEdict( const edict_t *pEdict, qboolean spawned_only );
-int SV_MapIsValid( const char *filename, const char *spawn_entity, const char *landmark_name );
+uint SV_MapIsValid( const char *filename, const char *spawn_entity, const char *landmark_name );
 void SV_StartSound( edict_t *ent, int chan, const char *sample, float vol, float attn, int flags, int pitch );
 edict_t *SV_FindGlobalEntity( string_t classname, string_t globalname );
 qboolean SV_CreateStaticEntity( struct sizebuf_s *msg, int index );
diff --git a/engine/server/sv_game.c b/engine/server/sv_game.c
index d62445af..34d68327 100644
--- a/engine/server/sv_game.c
+++ b/engine/server/sv_game.c
@@ -681,7 +681,7 @@ Issue changing level
 */
 void SV_QueueChangeLevel( const char *level, const char *landname )
 {
-	int	flags, smooth = false;
+	uint	flags, smooth = false;
 	char	mapname[MAX_QPATH];
 	char	*spawn_entity;
 
@@ -880,9 +880,9 @@ SV_MapIsValid
 Validate map
 ==============
 */
-int SV_MapIsValid( const char *filename, const char *spawn_entity, const char *landmark_name )
+uint SV_MapIsValid( const char *filename, const char *spawn_entity, const char *landmark_name )
 {
-	int	flags = 0;
+	uint	flags = 0;
 	char	*pfile;
 	char	*ents;
 
@@ -3679,7 +3679,7 @@ vaild map must contain one info_player_deatchmatch
 */
 int GAME_EXPORT pfnIsMapValid( char *filename )
 {
-	int	flags = SV_MapIsValid( filename, GI->mp_entity, NULL );
+	uint	flags = SV_MapIsValid( filename, GI->mp_entity, NULL );
 
 	if( FBitSet( flags, MAP_IS_EXIST ) && FBitSet( flags, MAP_HAS_SPAWNPOINT ))
 		return true;
diff --git a/engine/server/sv_save.c b/engine/server/sv_save.c
index 2162e2f1..8fdc2b9b 100644
--- a/engine/server/sv_save.c
+++ b/engine/server/sv_save.c
@@ -2096,7 +2096,7 @@ qboolean SV_LoadGame( const char *pPath )
 	qboolean		validload = false;
 	GAME_HEADER	gameHeader;
 	file_t		*pFile;
-	int		flags;
+	uint		flags;
 
 	if( Host_IsDedicated() )
 		return false;
@@ -2289,7 +2289,7 @@ int GAME_EXPORT SV_GetSaveComment( const char *savename, char *comment )
 
 	if( tag == 0x0065 )
 	{
-		Q_strncpy( comment, "old version Xash3D <unsupported>", MAX_STRING );
+		Q_strncpy( comment, "<old version Xash3D unsupported>", MAX_STRING );
 		FS_Close( f );
 		return 0;
 	}
@@ -2409,7 +2409,7 @@ int GAME_EXPORT SV_GetSaveComment( const char *savename, char *comment )
 		time_t		fileTime;
 		const struct tm	*file_tm;
 		string		timestring;
-		int		flags;
+		uint		flags;
 
 		// now check for map problems
 		flags = SV_MapIsValid( mapName, GI->sp_entity, NULL );