diff --git a/engine/client/view.c b/engine/client/view.c
index 2416c5bd2..66e15fbbb 100644
--- a/engine/client/view.c
+++ b/engine/client/view.c
@@ -818,17 +818,17 @@ void V_CalcBlend (float *hw_blend)
 		//don't apply it to the server, we'll blend the two later if the user has no hardware gamma (if they do have it, we use just the server specified value) This way we avoid winnt users having a cheat with flashbangs and stuff.
 		for (j=0 ; j<NUM_CSHIFTS ; j++)
 		{
-			if (j != CSHIFT_SERVER && j != CSHIFT_BONUS)
+			if ((j == CSHIFT_SERVER&&!cls.demoplayback) || j == CSHIFT_BONUS)
+			{
+				a2 = pv->cshifts[j].percent / 255.0;	//don't allow modification of this one.
+			}
+			else
 			{
 				if (!gl_cshiftpercent.value || !gl_cshiftenabled.ival)
 					continue;
 
 				a2 = ((pv->cshifts[j].percent * gl_cshiftpercent.value) / 100.0) / 255.0;
 			}
-			else
-			{
-				a2 = pv->cshifts[j].percent / 255.0;	//don't allow modification of this one.
-			}
 
 			if (a2 <= 0)
 				continue;
diff --git a/engine/d3d/d3d_backend.c b/engine/d3d/d3d_backend.c
index fd1fb8974..b2aaeffb4 100644
--- a/engine/d3d/d3d_backend.c
+++ b/engine/d3d/d3d_backend.c
@@ -1658,7 +1658,7 @@ static void GenerateFogTexture(texid_t *tex, float density, float zscale)
 
 	if (!TEXVALID(*tex))
 		*tex = Image_CreateTexture("***fog***", NULL, IF_CLAMP|IF_NOMIPMAP);
-	Image_Upload(*tex, TF_RGBA32, fogdata, NULL, FOGS, FOGT, IF_CLAMP|IF_NOMIPMAP);
+	Image_Upload(*tex, TF_RGBA32, fogdata, NULL, FOGS, FOGT, 1, IF_CLAMP|IF_NOMIPMAP);
 }