diff --git a/src/m_menu.c b/src/m_menu.c
index 88fcd33b..69f6135c 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -111,7 +111,7 @@ const char *quitmsg[NUM_QUITMESSAGES];
 // Stuff for customizing the player select screen Tails 09-22-2003
 description_t description[32] =
 {
-	{"\x82Sonic\x80\n\x82Speed:\x80 6\n\x82Weight:\x80 4", "", "sonic"},
+	{"\x82Sonic\x80\n\x82Speed:\x80 7\n\x82Weight:\x80 3", "", "sonic"},
 	{"???", "", ""},
 	{"???", "", ""},
 	{"???", "", ""},
diff --git a/src/r_things.c b/src/r_things.c
index bac05b2f..541a7816 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -2467,8 +2467,8 @@ static void Sk_SetDefaultValue(skin_t *skin)
 	skin->prefcolor = SKINCOLOR_GREEN;
 
 	// SRB2kart
-	skin->kartspeed = 6;
-	skin->kartweight = 4;
+	skin->kartspeed = 5;
+	skin->kartweight = 5;
 	//
 
 	skin->normalspeed = 36<<FRACBITS;
@@ -2534,6 +2534,11 @@ void R_InitSkins(void)
 	skin->ability =   CA_THOK;
 	skin->actionspd = 60<<FRACBITS;
 
+	// SRB2kart
+	skin->kartspeed = 7;
+	skin->kartweight = 3;
+	//
+
 	skin->normalspeed =  36<<FRACBITS;
 	skin->runspeed =     28<<FRACBITS;
 	skin->thrustfactor =  5;
diff --git a/src/y_inter.c b/src/y_inter.c
index ed651ce3..d2fe08e9 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -2192,6 +2192,9 @@ void Y_VoteDrawer(void)
 
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
+		if (dedicated && i == 0) // While leaving blank spots for non-existent players is largely intentional, the first spot *always* being blank looks a tad silly :V
+			continue;
+
 		if ((playeringame[i] && !players[i].spectator) && votes[i] != -1)
 		{
 			patch_t *pic;
@@ -2298,6 +2301,13 @@ void Y_VoteTicker(void)
 				numvotes++;
 			}
 
+			if (numvotes < 1) // Whoops! Get outta here.
+			{
+				Y_UnloadVoteData();
+				Y_FollowIntermission();
+				return;
+			}
+
 			voteclient.rtics--;
 
 			if (voteclient.rtics <= 0)