diff --git a/engine/server/sv_custom.c b/engine/server/sv_custom.c
index 112d74e1..ed65820e 100644
--- a/engine/server/sv_custom.c
+++ b/engine/server/sv_custom.c
@@ -533,7 +533,7 @@ void SV_BatchUploadRequest( sv_client_t *cl )
 
 void SV_SendResource( resource_t *pResource, sizebuf_t *msg )
 {
-	static byte	nullrguc[36];
+	static byte	nullrguc[sizeof( pResource->rguc_reserved )];
 
 	MSG_WriteUBitLong( msg, pResource->type, 4 );
 	MSG_WriteString( msg, pResource->szFileName );
diff --git a/engine/server/sv_game.c b/engine/server/sv_game.c
index 35626d83..21076253 100644
--- a/engine/server/sv_game.c
+++ b/engine/server/sv_game.c
@@ -108,7 +108,7 @@ entavrs table for FindEntityByString
 */
 TYPEDESCRIPTION *SV_GetEntvarsDescirption( int number )
 {
-	if( number < 0 && number >= ENTVARS_COUNT )
+	if( number < 0 || number >= ENTVARS_COUNT )
 		return NULL;
 	return &gEntvarsDescription[number];
 }
@@ -3984,7 +3984,7 @@ void GAME_EXPORT SV_PlaybackEventFull( int flags, const edict_t *pInvoker, word
 		return;	// someone stupid joke
 
 	// first check event for out of bounds
-	if( eventindex < 1 || eventindex > MAX_EVENTS )
+	if( eventindex < 1 || eventindex >= MAX_EVENTS )
 	{
 		Con_Printf( S_ERROR "EV_Playback: invalid eventindex %i\n", eventindex );
 		return;
@@ -4914,7 +4914,7 @@ qboolean SV_ParseEdict( char **pfile, edict_t *ent )
 			Mem_Free( pkvd[i].szValue );
 	}
 
-	if( classname && Mem_IsAllocatedExt( host.mempool, classname ))
+	if( Mem_IsAllocatedExt( host.mempool, classname ))
 		Mem_Free( classname );
 
 	return true;