diff --git a/src/gs-entbase/server/func_button.cpp b/src/gs-entbase/server/func_button.cpp
index efe66348..104a4c4d 100644
--- a/src/gs-entbase/server/func_button.cpp
+++ b/src/gs-entbase/server/func_button.cpp
@@ -285,12 +285,13 @@ void func_button::Use(void)
 
 void func_button::Pain (int body)
 {
-	Trigger(TRIG_TOGGLE);
+	/* how you doin? */
 }
 
 void func_button::Death (int body)
 {
 	Trigger(TRIG_TOGGLE);
+	health = m_oldHealth;
 }
 
 void func_button::Blocked(void)
diff --git a/src/menu-fn/entry.cpp b/src/menu-fn/entry.cpp
index 6c1e9fc4..a30b0579 100644
--- a/src/menu-fn/entry.cpp
+++ b/src/menu-fn/entry.cpp
@@ -71,6 +71,21 @@ Menu_AutoScale(void)
 	}
 }
 
+/* for old Half-Life configs */
+void
+Menu_GammaHack(void)
+{
+	if (cvar("brightness") != cvar("vid_brightness")) {
+		cvar_set("brightness", "0");
+		print("^1Menu_RendererRestarted^7: Brightness hack.\n");
+	}
+
+	if (cvar("gamma") != cvar("vid_gamma")) {
+		cvar_set("gamma", "1");
+		print("^1Menu_RendererRestarted^7: Gamma hack.\n");
+	}
+}
+
 void
 m_init(void)
 {
@@ -115,6 +130,7 @@ m_init(void)
 		g_menupage = PAGE_UPDATES;
 	}
 	Menu_AutoScale();
+	Menu_GammaHack();
 }
 
 void
@@ -122,16 +138,7 @@ Menu_RendererRestarted(string rendererdesc)
 {
 	localcmd("menu_restart\n");
 	Menu_AutoScale();
-
-	if (cvar("brightness") != cvar("vid_brightness")) {
-		cvar_set("brightness", cvar_string("vid_brightness"));
-		print("^1Menu_RendererRestarted^7: Brightness hack.\n");
-	}
-
-	if (cvar("gamma") != cvar("vid_gamma")) {
-		cvar_set("gamma", cvar_string("vid_gamma"));
-		print("^1Menu_RendererRestarted^7: Gamma hack.\n");
-	}
+	Menu_GammaHack();
 }
 
 void
diff --git a/src/menu-fn/m_videooptions.cpp b/src/menu-fn/m_videooptions.cpp
index 600929d7..b8c36891 100644
--- a/src/menu-fn/m_videooptions.cpp
+++ b/src/menu-fn/m_videooptions.cpp
@@ -14,6 +14,9 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+var float autocvar_vid_brightness = 0.0f;
+var float autocvar_vid_gamma = 1.0f;
+
 CWidget fn_vidoptions;
 CMainButton vo_btnDone;
 CSlider vo_sldScreensize;
@@ -45,13 +48,13 @@ vo_sldscreensize_changed(float val)
 void
 vo_sldgamma_changed(float val)
 {
-	cvar_set("gamma", ftos(val));
+	localcmd(sprintf("seta gamma %f; seta vid_gamma %f\n", val, val));
 }
 
 void
 vo_sldglare_changed(float val)
 {
-	cvar_set("brightness", ftos(val * 0.5));
+	localcmd(sprintf("seta brightness %f; seta vid_brightness %f\n", val, val));
 }
 
 /* Init */