diff --git a/engine/gl/gl_font.c b/engine/gl/gl_font.c
index 2a6ca9134..177976de6 100644
--- a/engine/gl/gl_font.c
+++ b/engine/gl/gl_font.c
@@ -430,7 +430,11 @@ void Font_Init(void)
 			"endif\n"
 			"nomipmaps\n"
 			"{\n"
-				"map $diffuse\n"
+				"if r_font_linear\n"
+					"map $linear:$diffuse\n"
+				"else\n"
+					"map $nearest:$diffuse\n"
+				"endif\n"
 				"rgbgen vertex\n"
 				"alphagen vertex\n"
 				"blendfunc gl_one gl_one_minus_src_alpha\n"
@@ -1452,7 +1456,7 @@ static texid_t Font_LoadReplacementConchars(void)
 {
 	texid_t tex;
 	//q1 replacement
-	tex = R_LoadHiResTexture("gfx/conchars.lmp", NULL, IF_NEAREST|IF_PREMULTIPLYALPHA|IF_LOADNOW|IF_UIPIC|IF_NOMIPMAP|IF_NOGAMMA);
+	tex = R_LoadHiResTexture("gfx/conchars.lmp", NULL, (r_font_linear.ival?IF_LINEAR:IF_NEAREST)|IF_PREMULTIPLYALPHA|IF_LOADNOW|IF_UIPIC|IF_NOMIPMAP|IF_NOGAMMA);
 	TEXDOWAIT(tex);
 	if (TEXLOADED(tex))
 		return tex;
@@ -1994,7 +1998,7 @@ struct font_s *Font_LoadFont(float vheight, const char *fontfilename)
 		//default to only map the ascii-compatible chars from the quake font.
 		if (*fontfilename)
 		{
-			f->singletexture = R_LoadHiResTexture(fontfilename, "fonts:charsets", IF_PREMULTIPLYALPHA|IF_UIPIC|IF_NOMIPMAP);
+			f->singletexture = R_LoadHiResTexture(fontfilename, "fonts:charsets", IF_PREMULTIPLYALPHA|(r_font_linear.ival?IF_LINEAR:IF_NEAREST)|IF_UIPIC|IF_NOPICMIP|IF_NOMIPMAP);
 			if (f->singletexture->status == TEX_LOADING)
 				COM_WorkerPartialSync(f->singletexture, &f->singletexture->status, TEX_LOADING);
 		}
@@ -2003,7 +2007,7 @@ struct font_s *Font_LoadFont(float vheight, const char *fontfilename)
 	defaultplane = INVALIDPLANE;/*assume the bitmap plane - don't use the fallback as people don't think to use com_parseutf8*/
 	if (TEXLOADED(f->singletexture))
 		defaultplane = BITMAPPLANE;
-	if (TEXLOADED(fontplanes.defaultfont))
+	else if (TEXLOADED(fontplanes.defaultfont))
 		defaultplane = DEFAULTPLANE;
 
 	if (defaultplane == INVALIDPLANE)
@@ -2025,7 +2029,7 @@ struct font_s *Font_LoadFont(float vheight, const char *fontfilename)
 
 		if (TEXLOADED(f->singletexture))
 			defaultplane = BITMAPPLANE;
-		if (TEXLOADED(fontplanes.defaultfont))
+		else if (TEXLOADED(fontplanes.defaultfont))
 			defaultplane = DEFAULTPLANE;
 	}
 
diff --git a/engine/server/sv_mvd.c b/engine/server/sv_mvd.c
index 26094246d..1c1d52927 100644
--- a/engine/server/sv_mvd.c
+++ b/engine/server/sv_mvd.c
@@ -35,7 +35,7 @@ static void QDECL SV_DemoDir_Callback(struct cvar_s *var, char *oldvalue);
 
 cvar_t	sv_demoUseCache = CVARD("sv_demoUseCache", "", "If set, demo data will be flushed only periodically");
 cvar_t	sv_demoCacheSize = CVAR("sv_demoCacheSize", "0x80000"); //half a meg
-cvar_t	sv_demoMaxDirSize = CVAR("sv_demoMaxDirSize", "102400");	//so ktpro autorecords.
+cvar_t	sv_demoMaxDirSize = CVARD("sv_demoMaxDirSize", "102400", "Maximum allowed serverside storage for mvds. set to blank to remove the limit. New demos cannot be recorded once this reaches 0.");	//so ktpro autorecords.
 cvar_t	sv_demoDir = CVARC("sv_demoDir", "demos", SV_DemoDir_Callback);
 cvar_t	sv_demofps = CVAR("sv_demofps", "30");
 cvar_t	sv_demoPings = CVARD("sv_demoPings", "10", "Interval between ping updates in mvds");