diff --git a/engine/server/sv_main.c b/engine/server/sv_main.c
index 0b74d7dde..da4247d6e 100644
--- a/engine/server/sv_main.c
+++ b/engine/server/sv_main.c
@@ -61,7 +61,7 @@ sv_masterlist_t sv_masterlist[] = {
 	{true, SCVAR("sv_masterextra1", "ghdigital.com")}, //69.59.212.88
 	{true, SCVAR("sv_masterextra2", "dpmaster.deathmask.net")}, //209.164.24.243
 	{true, SCVAR("sv_masterextra3", "12.166.196.192")}, //blaze.mindphukd.org (doesn't resolve currently but works as an ip)
-	{false, {NULL}}
+	{false, SCVAR(NULL, NULL)}
 };
 
 client_t	*host_client;			// current client
diff --git a/engine/sw/d_init.c b/engine/sw/d_init.c
index aa60f76c0..1defae115 100644
--- a/engine/sw/d_init.c
+++ b/engine/sw/d_init.c
@@ -24,9 +24,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #define NUM_MIPS	4
 
-cvar_t	d_subdiv16 = {"d_subdiv16", "1"};
-cvar_t	d_mipcap = {"d_mipcap", "0"};
-cvar_t	d_mipscale = {"d_mipscale", "0.5"};
+cvar_t	d_subdiv16 = SCVAR("d_subdiv16", "1");
+cvar_t	d_mipcap = SCVAR("d_mipcap", "0");
+cvar_t	d_mipscale = SCVAR("d_mipscale", "0.5");
 extern cvar_t	d_smooth;
 
 surfcache_t		*d_initial_rover;