diff --git a/src/g_demo.c b/src/g_demo.c
index 5cbe6ce38..c3a72d95e 100644
--- a/src/g_demo.c
+++ b/src/g_demo.c
@@ -2950,13 +2950,14 @@ void G_DeferedPlayDemo(const char *name)
 
 #define SKIPERRORS
 
-void G_DoPlayDemo(char *defdemoname)
+void G_DoPlayDemo(const char *defdemoname)
 {
 	INT32 i;
 	UINT8 p, numslots = 0;
 	lumpnum_t l;
 	char color[MAXCOLORNAME+1],follower[17],mapname[MAXMAPLUMPNAME],gtname[MAXGAMETYPELENGTH];
-	char *n,*pdemoname;
+	const char *n;
+	char *pdemoname;
 	UINT8 availabilities[MAXPLAYERS][MAXAVAILABILITY];
 	UINT8 version,subversion;
 	UINT32 randseed[PRNUMCLASS];
diff --git a/src/g_demo.h b/src/g_demo.h
index 661dacada..a10ce88ad 100644
--- a/src/g_demo.h
+++ b/src/g_demo.h
@@ -181,7 +181,7 @@ extern demoghost *ghosts;
 #define DFILE_ERROR_EXTRAFILES           0x05 // Extra files outside of the replay's file list are loaded.
 
 void G_DeferedPlayDemo(const char *demo);
-void G_DoPlayDemo(char *defdemoname);
+void G_DoPlayDemo(const char *defdemoname);
 void G_TimeDemo(const char *name);
 void G_AddGhost(UINT8 *buffer, char *defdemoname);
 staffbrief_t *G_GetStaffGhostBrief(UINT8 *buffer);
diff --git a/src/k_hud.c b/src/k_hud.c
index 145d9f502..d23c107a4 100644
--- a/src/k_hud.c
+++ b/src/k_hud.c
@@ -1150,7 +1150,7 @@ static void K_initKartHUD(void)
 	}
 }
 
-void K_DrawMapThumbnail(INT32 x, INT32 y, INT32 width, UINT32 flags, UINT16 map, UINT8 *colormap)
+void K_DrawMapThumbnail(fixed_t x, fixed_t y, fixed_t width, UINT32 flags, UINT16 map, const UINT8 *colormap)
 {
 	patch_t *PictureOfLevel = NULL;
 
@@ -1170,7 +1170,7 @@ void K_DrawMapThumbnail(INT32 x, INT32 y, INT32 width, UINT32 flags, UINT16 map,
 	K_DrawLikeMapThumbnail(x, y, width, flags, PictureOfLevel, colormap);
 }
 
-void K_DrawLikeMapThumbnail(INT32 x, INT32 y, INT32 width, UINT32 flags, patch_t *patch, UINT8 *colormap)
+void K_DrawLikeMapThumbnail(fixed_t x, fixed_t y, fixed_t width, UINT32 flags, patch_t *patch, const UINT8 *colormap)
 {
 	if (flags & V_FLIP)
 		x += width;
diff --git a/src/k_hud.h b/src/k_hud.h
index 464737059..5bdc53a9e 100644
--- a/src/k_hud.h
+++ b/src/k_hud.h
@@ -42,8 +42,8 @@ void K_drawKartHUD(void);
 void K_drawKartFreePlay(void);
 void K_drawKartTimestamp(tic_t drawtime, INT32 TX, INT32 TY, INT32 splitflags, UINT8 mode);
 void K_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, INT32 whiteplayer, INT32 hilicol);
-void K_DrawMapThumbnail(INT32 x, INT32 y, INT32 width, UINT32 flags, UINT16 map, UINT8 *colormap);
-void K_DrawLikeMapThumbnail(INT32 x, INT32 y, INT32 width, UINT32 flags, patch_t *patch, UINT8 *colormap);
+void K_DrawMapThumbnail(fixed_t x, fixed_t y, fixed_t width, UINT32 flags, UINT16 map, const UINT8 *colormap);
+void K_DrawLikeMapThumbnail(fixed_t x, fixed_t y, fixed_t width, UINT32 flags, patch_t *patch, const UINT8 *colormap);
 void K_drawTargetHUD(const vector3_t *origin, player_t *player);
 void K_drawButton(fixed_t x, fixed_t y, INT32 flags, patch_t *button[2], boolean pressed);
 void K_drawButtonAnim(INT32 x, INT32 y, INT32 flags, patch_t *button[2], tic_t animtic);