diff --git a/engine/client/keys.c b/engine/client/keys.c
index 180a32aff..a2840a77f 100644
--- a/engine/client/keys.c
+++ b/engine/client/keys.c
@@ -2553,8 +2553,7 @@ void Key_Unbindall_f (void)
 	int		i;
 	
 	for (i=0 ; i<K_MAX ; i++)
-		if (keybindings[i])
-			Key_SetBinding (i, ~0, NULL, Cmd_ExecLevel);
+		Key_SetBinding (i, ~0, NULL, Cmd_ExecLevel);
 }
 
 void Key_Bind_c(int argn, const char *partial, struct xcommandargcompletioncb_s *ctx)
diff --git a/engine/client/pr_csqc.c b/engine/client/pr_csqc.c
index 75cdb3ec5..2a162bfb0 100644
--- a/engine/client/pr_csqc.c
+++ b/engine/client/pr_csqc.c
@@ -6759,7 +6759,7 @@ static void QCBUILTIN PF_resourcestatus(pubprogfuncs_t *prinst, struct globalvar
 		return;
 	case RESTYPE_SOUND:
 		sfx = NULL;
-		for (idx=1 ; idx<MAX_PRECACHE_SOUNDS && cl.sound_name[idx] ; idx++)
+		for (idx=1 ; idx<MAX_PRECACHE_SOUNDS; idx++)
 		{
 			if (!strcmp(cl.sound_name[idx], resname))
 			{
diff --git a/engine/client/sbar.c b/engine/client/sbar.c
index f897651c4..663f52541 100644
--- a/engine/client/sbar.c
+++ b/engine/client/sbar.c
@@ -3052,7 +3052,7 @@ void Sbar_Draw (playerview_t *pv)
 		R2D_ImageColours(1, 1, 1, 1);
 		if (*cl.q2statusbar)
 			Sbar_ExecuteLayoutString(cl.q2statusbar, seat);
-		if (*cl.q2layout && (cl.q2frame.playerstate[seat].stats[Q2STAT_LAYOUTS] & 1))
+		if (cl.q2frame.playerstate[seat].stats[Q2STAT_LAYOUTS] & 1)
 			Sbar_ExecuteLayoutString(cl.q2layout[seat], seat);
 		if (cl.q2frame.playerstate[seat].stats[Q2STAT_LAYOUTS] & 2)
 			Sbar_Q2DrawInventory(seat);