diff --git a/src/k_hud.c b/src/k_hud.c
index 2f0c1c3b0..6a47c82bc 100644
--- a/src/k_hud.c
+++ b/src/k_hud.c
@@ -711,7 +711,7 @@ boolean K_UseColorHud(void)
 	return cv_colorizedhud.value;
 }
 
-UINT8 K_GetHudColor(void)
+skincolornum_t K_GetHudColor(void)
 {
 	if (cv_colorizedhud.value && cv_colorizedhudcolor.value) return cv_colorizedhudcolor.value;
 
@@ -5135,7 +5135,7 @@ static void K_drawInput(void)
 	INT32 x = (BASEVIDWIDTH - 32)*FRACUNIT, y = (BASEVIDHEIGHT - 24)*FRACUNIT;
 	UINT8 *shadowcolormap = NULL;
 	INT32 offs, col;
-	const UINT8 hudcolor = K_GetHudColor();
+	const skincolornum_t hudcolor = K_GetHudColor();
 	const INT32 accent1 = splitflags | skincolors[hudcolor].ramp[5];
 	const INT32 accent2 = splitflags | skincolors[hudcolor].ramp[9];
 	const UINT8 *hudcolormap = R_GetTranslationColormap(0, hudcolor, GTC_CACHE);
diff --git a/src/k_hud.h b/src/k_hud.h
index 2e26315f5..6701e84f5 100644
--- a/src/k_hud.h
+++ b/src/k_hud.h
@@ -102,7 +102,7 @@ void K_getSlipstreamDrawinfo(drawinfo_t *out);
 void K_getLivesnStatsDrawinfo(drawinfo_t *out);
 void K_ReloadHUDColorCvar(void);
 boolean K_UseColorHud(void);
-UINT8 K_GetHudColor(void);
+skincolornum_t K_GetHudColor(void);
 void K_LoadKartHUDGraphics(void);
 void K_drawKartHUD(void);
 void K_drawKartFreePlay(void);
diff --git a/src/m_menu.c b/src/m_menu.c
index 5d5a32acd..bdfee4c42 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -5098,7 +5098,7 @@ INT32 MR_HutStartReplay(INT32 choice)
 {
 	(void)choice;
 
-	COM_BufAddText(va("playdemo %s %s",
+	COM_BufAddText(va("playdemo \"%s\" %s",
 	               demolist[dir_on[menudepthleft]].filepath + strlen(srb2home) + 1, // dumb hack
 	               M_IsItemOn(MN_MISC_REPLAYSTART, "LOADWATCH") ? "-addfiles" : "-force"));
 	return true;
@@ -6649,7 +6649,7 @@ INT32 MR_ReplayTimeAttack(INT32 arg)
 
 	CLEANUP(pfree) char *gpath = G_GetRecordReplayFolder(false, levellistmode == LLM_ITEMBREAKER);
 	CLEANUP(pfree) char *demopath = G_GetRecordReplay(gpath, cv_nextmap.value, cv_chooseskin.value, arg);
-	COM_BufAddText(va("playdemo %s -force", demopath));
+	COM_BufAddText(va("playdemo \"%s\" -force", demopath));
 	return true;
 }
 
diff --git a/src/y_inter.c b/src/y_inter.c
index cc11ace5a..e343302a7 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -652,14 +652,9 @@ void Y_IntermissionDrawer(void)
 					// RETIRED!!
 					patch_t *retire = W_CachePatchName("K_NOBLNS", PU_CACHE);
 					if (manyplayers16)
-					{
-						fixed_t scale = FRACUNIT/2;
-						V_DrawFixedPatch(x+6, y-3, scale, 0, retire, NULL);
-					}
+						V_DrawSmallScaledPatch(x+6, y-1, 0, retire);
 					else
-					{
 						V_DrawScaledPatch(x+12, y-7, 0, retire);
-					}
 				}
 
 				STRBUFCPY(strtime, data.name[i]);