diff --git a/sp/src/materialsystem/stdshaders/SDK_teeth_bump_vs20.fxc b/sp/src/materialsystem/stdshaders/SDK_teeth_bump_vs20.fxc
index 1dd834b5..ddca526a 100644
--- a/sp/src/materialsystem/stdshaders/SDK_teeth_bump_vs20.fxc
+++ b/sp/src/materialsystem/stdshaders/SDK_teeth_bump_vs20.fxc
@@ -55,7 +55,7 @@ struct VS_INPUT
 struct VS_OUTPUT
 {
     float4 projPos							: POSITION;
-#if !defined( _X360 )    	
+#if !defined( _X360 ) && !defined( SHADER_MODEL_VS_3_0 ) && !INTRO    	
 	float  fog								: FOG;
 #endif
 	float2 baseTexCoord						: TEXCOORD0;
@@ -105,10 +105,9 @@ VS_OUTPUT main( const VS_INPUT v )
 	o.projPos = vProjPos;
 	vProjPos.z = dot( float4( worldPos, 1 ), cViewProjZ );
 
-	o.worldPos_projPosZ = float4( worldPos, vProjPos.z );
-#if !defined( _X360 )
-	// Set fixed-function fog factor
-	o.fog = CalcFog( worldPos, vProjPos, g_FogType );
+	o.worldPos_projPosZ = float4( worldPos.xyz, vProjPos.z );
+#if !defined( _X360 )&& !defined( SHADER_MODEL_VS_3_0 ) && !INTRO
+	o.fog = CalcFixedFunctionFog( worldPos, g_FogType );
 #endif
 	// Needed for specular
 	o.worldVertToEyeVector_Darkening.xyz = cEyePos - worldPos;
diff --git a/sp/src/materialsystem/stdshaders/SDK_windowimposter_ps2x.fxc b/sp/src/materialsystem/stdshaders/SDK_windowimposter_ps2x.fxc
index fc3ea25a..8863683e 100644
--- a/sp/src/materialsystem/stdshaders/SDK_windowimposter_ps2x.fxc
+++ b/sp/src/materialsystem/stdshaders/SDK_windowimposter_ps2x.fxc
@@ -24,11 +24,11 @@ struct PS_INPUT
 	float3 eyeToVertVector			: TEXCOORD0;
 	float4 vertexColor				: COLOR;
 	
-#if PARALLAXCORRECT
-	float3 worldSpaceNormal			: TEXCOORD1;
-#endif
+	float4 worldPos_projPosZ		: TEXCOORD1;		// Necessary for pixel fog
 	
-	float4 worldPos_projPosZ		: TEXCOORD2;		// Necessary for pixel fog
+#if PARALLAXCORRECT
+	float3 worldSpaceNormal			: TEXCOORD2;
+#endif
 };
 
 float4 main( PS_INPUT i ) : COLOR
diff --git a/sp/src/materialsystem/stdshaders/SDK_windowimposter_vs20.fxc b/sp/src/materialsystem/stdshaders/SDK_windowimposter_vs20.fxc
index f67676ee..3a6a9334 100644
--- a/sp/src/materialsystem/stdshaders/SDK_windowimposter_vs20.fxc
+++ b/sp/src/materialsystem/stdshaders/SDK_windowimposter_vs20.fxc
@@ -28,11 +28,11 @@ struct VS_OUTPUT
 	float3 eyeToVertVector	: TEXCOORD0;
 	float4 vertexColor		: COLOR;
 	
-#if PARALLAXCORRECT
-	float3 worldNormal				: TEXCOORD1;
-#endif
+	float4 worldPos_projPosZ		: TEXCOORD1;		// Necessary for pixel fog
 	
-	float4 worldPos_projPosZ		: TEXCOORD2;		// Necessary for pixel fog
+#if PARALLAXCORRECT
+	float3 worldNormal				: TEXCOORD2;
+#endif
 };
 
 VS_OUTPUT main( const VS_INPUT v )