diff --git a/src/client/hud.qc b/src/client/hud.qc
index 05b975a..672cf0a 100644
--- a/src/client/hud.qc
+++ b/src/client/hud.qc
@@ -144,7 +144,7 @@ HUD_Draw(void)
 	}else{
 		// Fake spectator, or the temporary forced third-person on death (not yet implemented).
 		
-		drawfont = FONT_20;
+		drawfont = Font_GetID(FONT_20);
 		// TAGGG - could have some message from server-to-client on changing from
 		// player to spectator to call this only then, but I think doing this every
 		// frame for spectator is harmless anyway. Changing the FOV isn't necessary,
@@ -184,7 +184,7 @@ HUD_DrawSpectator(void)
 
 	spectator spec = (spectator)pSeat->m_ePlayer;
 
-	drawfont = FONT_20;
+	drawfont = Font_GetID(FONT_20);
 	vector vecPos;
 	string strText;
 
diff --git a/src/client/init.qc b/src/client/init.qc
index 8c2bc47..052346d 100644
--- a/src/client/init.qc
+++ b/src/client/init.qc
@@ -142,7 +142,7 @@ ClientGame_Init(float apilevel, string enginename, float engineversion)
 	// safe default for whatever doesn't specify it?
 	// Beware that draw calls that don't set the drawfont will still rely
 	// on the previously set one, although that could be intentional too.
-	drawfont = FONT_CON;
+	drawfont = Font_GetID(FONT_CON);
 	//////////////////////////////////////////////////////////////////
 	
 	UI_Init();
diff --git a/src/client/obituary.qc b/src/client/obituary.qc
index fadb7c8..607b301 100644
--- a/src/client/obituary.qc
+++ b/src/client/obituary.qc
@@ -148,7 +148,7 @@ Obituary_Draw(void)
 	int i;
 	vector pos;
 	vector item;
-	drawfont = FONT_CON;
+	drawfont = Font_GetID(FONT_CON);
 	pos = g_hudmins + [g_hudres[0] - 18, 56];
 
 	if (g_obituary_time <= 0 && g_obituary_count > 0) {
diff --git a/src/client/scoreboard.qc b/src/client/scoreboard.qc
index fbc84cb..e6c082e 100644
--- a/src/client/scoreboard.qc
+++ b/src/client/scoreboard.qc
@@ -31,7 +31,7 @@ Scores_DrawTeam(player pl, vector pos)
 {
 	drawfill(pos, [290, 1], SCORE_LINE_C, 1.0f, DRAWFLAG_ADDITIVE);
 
-	drawfont = FONT_20;
+	drawfont = Font_GetID(FONT_20);
 	drawstring(pos + [0,-18], "Teams", [20,20], SCORE_HEADER_C, 1.0f, DRAWFLAG_ADDITIVE);
 	drawstring(pos + [124,-18], "kills / deaths", [20,20], SCORE_HEADER_C, 1.0f, DRAWFLAG_ADDITIVE);
 	drawstring(pos + [240,-18], "latency", [20,20], SCORE_HEADER_C, 1.0f, DRAWFLAG_ADDITIVE);
@@ -100,7 +100,7 @@ Scores_DrawTeam(player pl, vector pos)
 		pos[1] += 12;
 	}
 	
-	drawfont = FONT_CON;
+	drawfont = Font_GetID(FONT_CON);
 }
 
 void
@@ -108,7 +108,7 @@ Scores_DrawNormal(player pl, vector pos)
 {
 	drawfill(pos, [290, 1], SCORE_LINE_C, 1.0f, DRAWFLAG_ADDITIVE);
 
-	drawfont = FONT_20;
+	drawfont = Font_GetID(FONT_20);
 	drawstring(pos + [0,-18], "Player", [20,20], SCORE_HEADER_C, 1.0f, DRAWFLAG_ADDITIVE);
 	drawstring(pos + [124,-18], "kills / deaths", [20,20], SCORE_HEADER_C, 1.0f, DRAWFLAG_ADDITIVE);
 	drawstring(pos + [240,-18], "latency", [20,20], SCORE_HEADER_C, 1.0f, DRAWFLAG_ADDITIVE);
@@ -154,7 +154,7 @@ Scores_DrawNormal(player pl, vector pos)
 		pos[1] += 20;
 	}
 	
-	drawfont = FONT_CON;
+	drawfont = Font_GetID(FONT_CON);
 }
 
 void