diff --git a/engine/client/cl_main.c b/engine/client/cl_main.c
index 9e12c3ac9..f9b01cca5 100644
--- a/engine/client/cl_main.c
+++ b/engine/client/cl_main.c
@@ -1187,7 +1187,10 @@ void CL_Disconnect (void)
 #ifndef CLIENTONLY
 	if (!isDedicated)
 #endif
+	{
 		SCR_EndLoadingPlaque();
+		V_ClearCShifts();
+	}
 
 	cls.protocol = CP_UNKNOWN;
 	cl.servercount = 0;
diff --git a/engine/client/client.h b/engine/client/client.h
index db25d5021..b757ced38 100644
--- a/engine/client/client.h
+++ b/engine/client/client.h
@@ -829,7 +829,6 @@ void V_StartPitchDrift (int pnum);
 void V_StopPitchDrift (int pnum);
 
 void V_RenderView (void);
-void V_UpdatePalette (void);
 void V_Register (void);
 void V_ParseDamage (int pnum);
 void V_SetContentsColor (int contents);
diff --git a/engine/client/view.c b/engine/client/view.c
index ab784ccfb..95dad2689 100644
--- a/engine/client/view.c
+++ b/engine/client/view.c
@@ -370,7 +370,7 @@ void SWV_Gamma_Callback(struct cvar_s *var, char *oldvalue)
 {
 	BuildGammaTable (v_gamma.value, v_contrast.value);
 	vid.recalc_refdef = 1; // force a surface cache flush
-	SWV_UpdatePalette (true);
+	SWV_UpdatePalette (true, 0);
 }
 #endif
 
@@ -379,7 +379,7 @@ void GLV_Gamma_Callback(struct cvar_s *var, char *oldvalue)
 {
 	BuildGammaTable (v_gamma.value, v_contrast.value);
 	vid.recalc_refdef = 1; // force a surface cache flush
-	GLV_UpdatePalette (true);
+	GLV_UpdatePalette (true, 0);
 }
 #endif
 
@@ -691,7 +691,7 @@ void GLV_CalcBlend (void)
 V_UpdatePalette
 =============
 */
-void GLV_UpdatePalette (qboolean force)
+void GLV_UpdatePalette (qboolean force, double ftime)
 {
 //	qboolean ogw;
 	int		i, j;
@@ -705,16 +705,6 @@ void GLV_UpdatePalette (qboolean force)
 
 	V_CalcPowerupCshift ();
 
-// drop the damage value
-	cl.cshifts[CSHIFT_DAMAGE].percent -= host_frametime*150;
-	if (cl.cshifts[CSHIFT_DAMAGE].percent <= 0)
-		cl.cshifts[CSHIFT_DAMAGE].percent = 0;
-
-// drop the bonus value
-	cl.cshifts[CSHIFT_BONUS].percent -= host_frametime*100;
-	if (cl.cshifts[CSHIFT_BONUS].percent <= 0)
-		cl.cshifts[CSHIFT_BONUS].percent = 0;
-
 	update = false;
 
 	for (i=0 ; i<CSHIFT_SERVER ; i++)
@@ -732,6 +722,16 @@ void GLV_UpdatePalette (qboolean force)
 			}
 	}
 
+// drop the damage value
+	cl.cshifts[CSHIFT_DAMAGE].percent -= ftime*150;
+	if (cl.cshifts[CSHIFT_DAMAGE].percent <= 0)
+		cl.cshifts[CSHIFT_DAMAGE].percent = 0;
+
+// drop the bonus value
+	cl.cshifts[CSHIFT_BONUS].percent -= ftime*100;
+	if (cl.cshifts[CSHIFT_BONUS].percent <= 0)
+		cl.cshifts[CSHIFT_BONUS].percent = 0;
+
 	if (update || force)
 	{
 		GLV_CalcBlend ();
@@ -776,7 +776,7 @@ V_UpdatePalette
 =============
 */
 #ifdef SWQUAKE
-void SWV_UpdatePalette (qboolean force)
+void SWV_UpdatePalette (qboolean force, double ftime)
 {
 	int		i, j;
 	qboolean	update;
@@ -806,12 +806,12 @@ void SWV_UpdatePalette (qboolean force)
 	}
 	
 // drop the damage value
-	cl.cshifts[CSHIFT_DAMAGE].percent -= host_frametime*150;
+	cl.cshifts[CSHIFT_DAMAGE].percent -= ftime*150;
 	if (cl.cshifts[CSHIFT_DAMAGE].percent <= 0)
 		cl.cshifts[CSHIFT_DAMAGE].percent = 0;
 
 // drop the bonus value
-	cl.cshifts[CSHIFT_BONUS].percent -= host_frametime*100;
+	cl.cshifts[CSHIFT_BONUS].percent -= ftime*100;
 	if (cl.cshifts[CSHIFT_BONUS].percent <= 0)
 		cl.cshifts[CSHIFT_BONUS].percent = 0;
 
@@ -871,6 +871,14 @@ void SWV_UpdatePalette (qboolean force)
 
 #endif	// SWQUAKE
 
+void V_ClearCShifts (void)
+{
+	int i;
+
+	for (i = 0; i < NUM_CSHIFTS; i++)
+		cl.cshifts[i].percent = 0;
+}
+
 /* 
 ============================================================================== 
  
diff --git a/engine/client/view.h b/engine/client/view.h
index ca6632053..7341bffea 100644
--- a/engine/client/view.h
+++ b/engine/client/view.h
@@ -29,8 +29,9 @@ extern qboolean r_secondaryview;
 void V_Init (void);
 void V_RenderView (void);
 float V_CalcRoll (vec3_t angles, vec3_t velocity);
-void GLV_UpdatePalette (qboolean force);
-void SWV_UpdatePalette (qboolean force);
+void GLV_UpdatePalette (qboolean force, double ftime);
+void SWV_UpdatePalette (qboolean force, double ftime);
+void V_ClearCShifts (void);
 qboolean V_CheckGamma (void);
 void V_AddEntity(entity_t *in);
 void V_AddLerpEntity(entity_t *in);
diff --git a/engine/d3d/vid_d3d.c b/engine/d3d/vid_d3d.c
index 5bcc5eec4..32716b038 100644
--- a/engine/d3d/vid_d3d.c
+++ b/engine/d3d/vid_d3d.c
@@ -958,7 +958,7 @@ void	(D3D_SCR_UpdateScreen)			(void)
 	if (editormodal)
 	{
 		Editor_Draw();
-		GLV_UpdatePalette (false);
+		GLV_UpdatePalette (false, host_frametime);
 #if defined(_WIN32) && defined(RGLQUAKE)
 		Media_RecordFrame();
 #endif
@@ -976,7 +976,7 @@ void	(D3D_SCR_UpdateScreen)			(void)
 	if (Media_ShowFilm())
 	{
 		M_Draw(0);
-//		GLV_UpdatePalette (false);
+//		GLV_UpdatePalette (false, host_frametime);
 #if defined(_WIN32)
 		Media_RecordFrame();
 #endif
@@ -1032,7 +1032,7 @@ void	(D3D_SCR_UpdateScreen)			(void)
 
 	SCR_DrawTwoDimensional(uimenu, nohud);
 
-//	GLV_UpdatePalette (false);
+//	GLV_UpdatePalette (false, host_frametime);
 #if defined(_WIN32) && defined(RGLQUAKE)
 	Media_RecordFrame();
 #endif
diff --git a/engine/d3d9/vid_d3d9.c b/engine/d3d9/vid_d3d9.c
index e5b62f166..075406a52 100644
--- a/engine/d3d9/vid_d3d9.c
+++ b/engine/d3d9/vid_d3d9.c
@@ -1228,7 +1228,7 @@ void	(D3D9_SCR_UpdateScreen)			(void)
 	if (editormodal)
 	{
 		Editor_Draw();
-		GLV_UpdatePalette (false);
+		GLV_UpdatePalette (false, host_frametime);
 #if defined(_WIN32) && defined(RGLQUAKE)
 		Media_RecordFrame();
 #endif
@@ -1246,7 +1246,7 @@ void	(D3D9_SCR_UpdateScreen)			(void)
 	if (Media_ShowFilm())
 	{
 		M_Draw(0);
-//		GLV_UpdatePalette (false);
+//		GLV_UpdatePalette (false, host_frametime);
 #if defined(_WIN32)
 		Media_RecordFrame();
 #endif
@@ -1301,7 +1301,7 @@ void	(D3D9_SCR_UpdateScreen)			(void)
 
 	SCR_DrawTwoDimensional(uimenu, nohud);
 
-	GLV_UpdatePalette (false);
+	GLV_UpdatePalette (false, host_frametime);
 #if defined(_WIN32) && defined(RGLQUAKE)
 	Media_RecordFrame();
 #endif
diff --git a/engine/gl/gl_screen.c b/engine/gl/gl_screen.c
index 8053557c6..373cad0b0 100644
--- a/engine/gl/gl_screen.c
+++ b/engine/gl/gl_screen.c
@@ -186,7 +186,7 @@ void GLSCR_UpdateScreen (void)
 	if (editormodal)
 	{
 		Editor_Draw();
-		GLV_UpdatePalette (false);
+		GLV_UpdatePalette (false, host_frametime);
 #if defined(_WIN32) && defined(RGLQUAKE)
 		Media_RecordFrame();
 #endif
@@ -203,7 +203,7 @@ void GLSCR_UpdateScreen (void)
 	if (Media_ShowFilm())
 	{
 		M_Draw(0);
-		GLV_UpdatePalette (false);
+		GLV_UpdatePalette (false, host_frametime);
 #if defined(_WIN32) && defined(RGLQUAKE)
 		Media_RecordFrame();
 #endif
@@ -254,7 +254,7 @@ void GLSCR_UpdateScreen (void)
 
 	SCR_DrawTwoDimensional(uimenu, nohud);
 
-	GLV_UpdatePalette (false);
+	GLV_UpdatePalette (false, host_frametime);
 #if defined(_WIN32) && defined(RGLQUAKE)
 	Media_RecordFrame();
 #endif
diff --git a/engine/server/sv_mvd.c b/engine/server/sv_mvd.c
index 8eb7c7dff..791596f49 100644
--- a/engine/server/sv_mvd.c
+++ b/engine/server/sv_mvd.c
@@ -2540,10 +2540,6 @@ void SV_UserCmdMVDList_f (void)
 	float	f;
 	int		i,j,show;
 
-	int first;
-
-	first = Cmd_Argv(0);
-
 	Con_Printf("available demos\n");
 	dir = Sys_listdir(va("%s/%s", com_gamedir,sv_demoDir.string), ".mvd", SORT_BY_DATE);
 	list = dir->files;
diff --git a/engine/sw/sw_screen.c b/engine/sw/sw_screen.c
index e0db553ca..e000c4e2f 100644
--- a/engine/sw/sw_screen.c
+++ b/engine/sw/sw_screen.c
@@ -89,7 +89,7 @@ void SWSCR_UpdateScreen (void)
 	if (editormodal)
 	{
 		Editor_Draw();
-		SWV_UpdatePalette (false);
+		SWV_UpdatePalette (false, host_frametime);
 
 		vrect.x = 0;
 		vrect.y = 0;
@@ -103,7 +103,7 @@ void SWSCR_UpdateScreen (void)
 #endif
 	if (Media_ShowFilm())
 	{
-		SWV_UpdatePalette (false);
+		SWV_UpdatePalette (false, host_frametime);
 
 		vrect.x = 0;
 		vrect.y = 0;
@@ -159,7 +159,7 @@ void SWSCR_UpdateScreen (void)
 	D_DisableBackBufferAccess ();	// for adapters that can't stay mapped in
 									//  for linear writes all the time
 
-	SWV_UpdatePalette (false);
+	SWV_UpdatePalette (false, host_frametime);
 
 //
 // update one of three areas