diff --git a/code/client/cl_ui.c b/code/client/cl_ui.c
index 4d2628e5..71436484 100644
--- a/code/client/cl_ui.c
+++ b/code/client/cl_ui.c
@@ -639,9 +639,9 @@ CLUI_GetCDKey
 */
 static void CLUI_GetCDKey( char *buf, int buflen ) {
 #ifndef STANDALONE
-	cvar_t	*fs;
-	fs = Cvar_Get ("fs_game", "", CVAR_INIT|CVAR_SYSTEMINFO );
-	if (UI_usesUniqueCDKey() && fs && fs->string[0] != 0) {
+	const char *gamedir;
+	gamedir = Cvar_VariableString( "fs_game" );
+	if (UI_usesUniqueCDKey() && gamedir[0] != 0) {
 		Com_Memcpy( buf, &cl_cdkey[16], 16);
 		buf[16] = 0;
 	} else {
@@ -661,9 +661,9 @@ CLUI_SetCDKey
 */
 #ifndef STANDALONE
 static void CLUI_SetCDKey( char *buf ) {
-	cvar_t	*fs;
-	fs = Cvar_Get ("fs_game", "", CVAR_INIT|CVAR_SYSTEMINFO );
-	if (UI_usesUniqueCDKey() && fs && fs->string[0] != 0) {
+	const char *gamedir;
+	gamedir = Cvar_VariableString( "fs_game" );
+	if (UI_usesUniqueCDKey() && gamedir[0] != 0) {
 		Com_Memcpy( &cl_cdkey[16], buf, 16 );
 		cl_cdkey[32] = 0;
 		// set the flag so the fle will be written at the next opportunity
diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index dc340b53..3dbee88f 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -2943,9 +2943,6 @@ Writes key bindings and archived cvars to config file if modified
 ===============
 */
 void Com_WriteConfiguration( void ) {
-#if !defined(DEDICATED) && !defined(STANDALONE)
-	cvar_t	*fs;
-#endif
 	// if we are quiting without fully initializing, make sure
 	// we don't write out anything
 	if ( !com_fullyInitialized ) {
@@ -2961,12 +2958,12 @@ void Com_WriteConfiguration( void ) {
 
 	// not needed for dedicated or standalone
 #if !defined(DEDICATED) && !defined(STANDALONE)
-	fs = Cvar_Get ("fs_game", "", CVAR_INIT|CVAR_SYSTEMINFO );
-
 	if(!com_standalone->integer)
 	{
-		if (UI_usesUniqueCDKey() && fs && fs->string[0] != 0) {
-			Com_WriteCDKey( fs->string, &cl_cdkey[16] );
+		const char *gamedir;
+		gamedir = Cvar_VariableString( "fs_game" );
+		if (UI_usesUniqueCDKey() && gamedir[0] != 0) {
+			Com_WriteCDKey( gamedir, &cl_cdkey[16] );
 		} else {
 			Com_WriteCDKey( BASEGAME, cl_cdkey );
 		}
diff --git a/code/qcommon/files.c b/code/qcommon/files.c
index 246b3cd9..3545cd1d 100644
--- a/code/qcommon/files.c
+++ b/code/qcommon/files.c
@@ -3369,14 +3369,10 @@ static void FS_Startup( const char *gameName )
 	}
 
 #ifndef STANDALONE
-	if(!com_standalone->integer)
-	{
-		cvar_t	*fs;
-
+	if (!com_standalone->integer) {
 		Com_ReadCDKey(BASEGAME);
-		fs = Cvar_Get ("fs_game", "", CVAR_INIT|CVAR_SYSTEMINFO );
-		if (fs && fs->string[0] != 0) {
-			Com_AppendCDKey( fs->string );
+		if (fs_gamedirvar->string[0]) {
+			Com_AppendCDKey(fs_gamedirvar->string);
 		}
 	}
 #endif
diff --git a/code/server/sv_client.c b/code/server/sv_client.c
index d2950172..3d3ab6e1 100644
--- a/code/server/sv_client.c
+++ b/code/server/sv_client.c
@@ -176,15 +176,13 @@ void SV_GetChallenge(netadr_t from)
 		else
 		{
 			// otherwise send their ip to the authorize server
-			cvar_t	*fs;
-			char	game[1024];
+			const char *game;
 
 			Com_DPrintf( "sending getIpAuthorize for %s\n", NET_AdrToString( from ));
 		
-			strcpy(game, BASEGAME);
-			fs = Cvar_Get ("fs_game", "", CVAR_INIT|CVAR_SYSTEMINFO );
-			if (fs && fs->string[0] != 0) {
-				strcpy(game, fs->string);
+			game = Cvar_VariableString( "fs_game" );
+			if (game[0] == 0) {
+				game = BASEGAME;
 			}
 			
 			// the 0 is for backwards compatibility with obsolete sv_allowanonymous flags