diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 1013a28a5..c64804fef 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -35,7 +35,6 @@
 #include "p_spec.h"
 #include "m_cheat.h"
 #include "d_clisrv.h"
-#include "v_video.h"
 #include "d_main.h"
 #include "m_random.h"
 #include "f_finale.h"
@@ -956,31 +955,6 @@ void D_RegisterClientCommands(void)
 #endif
 #endif
 
-	// FIXME: not to be here.. but needs be done for config loading
-	CV_RegisterVar(&cv_globalgamma);
-	CV_RegisterVar(&cv_globalsaturation);
-
-	CV_RegisterVar(&cv_rhue);
-	CV_RegisterVar(&cv_yhue);
-	CV_RegisterVar(&cv_ghue);
-	CV_RegisterVar(&cv_chue);
-	CV_RegisterVar(&cv_bhue);
-	CV_RegisterVar(&cv_mhue);
-
-	CV_RegisterVar(&cv_rgamma);
-	CV_RegisterVar(&cv_ygamma);
-	CV_RegisterVar(&cv_ggamma);
-	CV_RegisterVar(&cv_cgamma);
-	CV_RegisterVar(&cv_bgamma);
-	CV_RegisterVar(&cv_mgamma);
-
-	CV_RegisterVar(&cv_rsaturation);
-	CV_RegisterVar(&cv_ysaturation);
-	CV_RegisterVar(&cv_gsaturation);
-	CV_RegisterVar(&cv_csaturation);
-	CV_RegisterVar(&cv_bsaturation);
-	CV_RegisterVar(&cv_msaturation);
-
 	// m_menu.c
 	//CV_RegisterVar(&cv_compactscoreboard);
 	CV_RegisterVar(&cv_chatheight);
diff --git a/src/http-mserv.c b/src/http-mserv.c
index 7ad84b71f..08b8821d4 100644
--- a/src/http-mserv.c
+++ b/src/http-mserv.c
@@ -544,6 +544,8 @@ HMS_fetch_rules (char *buffer, size_t buffer_size)
 		else
 			buffer = NULL;
 	}
+	else
+		buffer = NULL;
 
 	HMS_end(hms);
 
diff --git a/src/screen.c b/src/screen.c
index 06be64abf..d7aa1407e 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -233,6 +233,30 @@ void SCR_Startup(void)
 	CV_RegisterVar(&cv_menucaps);
 	CV_RegisterVar(&cv_constextsize);
 
+	CV_RegisterVar(&cv_globalgamma);
+	CV_RegisterVar(&cv_globalsaturation);
+
+	CV_RegisterVar(&cv_rhue);
+	CV_RegisterVar(&cv_yhue);
+	CV_RegisterVar(&cv_ghue);
+	CV_RegisterVar(&cv_chue);
+	CV_RegisterVar(&cv_bhue);
+	CV_RegisterVar(&cv_mhue);
+
+	CV_RegisterVar(&cv_rgamma);
+	CV_RegisterVar(&cv_ygamma);
+	CV_RegisterVar(&cv_ggamma);
+	CV_RegisterVar(&cv_cgamma);
+	CV_RegisterVar(&cv_bgamma);
+	CV_RegisterVar(&cv_mgamma);
+
+	CV_RegisterVar(&cv_rsaturation);
+	CV_RegisterVar(&cv_ysaturation);
+	CV_RegisterVar(&cv_gsaturation);
+	CV_RegisterVar(&cv_csaturation);
+	CV_RegisterVar(&cv_bsaturation);
+	CV_RegisterVar(&cv_msaturation);
+
 	V_SetPalette(0);
 }