diff --git a/src/g_game.c b/src/g_game.c
index 5942eecbe..6d9a4fe9a 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -4992,7 +4992,8 @@ void G_NextLevel(void)
 	}
 
 	forceresetplayers = false;
-	deferencoremode = (cv_kartencore.value == 1);
+	if (cv_kartencore.value == 1)
+		deferencoremode = true;
 
 	gameaction = ga_worlddone;
 }
diff --git a/src/y_inter.c b/src/y_inter.c
index 0c13c6fc6..69e2df335 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -2192,7 +2192,7 @@ void Y_StartVote(void)
 	for (i = 0; i < (rowval + 1); i++)
 	{
 		// set up the encore
-		levelinfo[i].encore = (g_voteLevels[i][1] & VOTEMODIFIER_ENCORE);
+		levelinfo[i].encore = (g_voteLevels[i][1] & VOTEMODIFIER_ENCORE) ? true : false;
 		g_voteLevels[i][1] &= ~VOTEMODIFIER_ENCORE;
 
 		// set up the levelstring