diff --git a/files/materials/objects.shader b/files/materials/objects.shader
index 238ccdcf6..dba239c14 100644
--- a/files/materials/objects.shader
+++ b/files/materials/objects.shader
@@ -192,7 +192,7 @@
 #if SHADOWS || SHADOWS_PSSM
             float fadeRange = shadowFar_fadeStart.x - shadowFar_fadeStart.y;
             float fade = 1-((depthPassthrough - shadowFar_fadeStart.y) / fadeRange);
-            shadow = (depthPassthrough > shadowFar_fadeStart.x) ? 1 : ((depthPassthrough > shadowFar_fadeStart.y) ? 1-((1-shadow)*fade) : shadow);
+            shadow = (depthPassthrough > shadowFar_fadeStart.x) ? 1.0 : ((depthPassthrough > shadowFar_fadeStart.y) ? 1.0-((1.0-shadow)*fade) : shadow);
 #endif
 
 #if !SHADOWS && !SHADOWS_PSSM
@@ -205,13 +205,12 @@
 #if UNDERWATER
     float3 worldPos = shMatrixMult(worldMatrix, float4(objSpacePositionPassthrough,1)).xyz;
     float3 waterEyePos = float3(1,1,1);
-    if (worldPos.y < waterLevel && waterEnabled == 1)
-    {
-        // NOTE: this calculation would be wrong for non-uniform scaling
-        float4 worldNormal = shMatrixMult(worldMatrix, float4(normal.xyz, 0));
-        waterEyePos = intercept(worldPos, cameraPos.xyz - worldPos, float3(0,1,0), waterLevel);
-        caustics = getCaustics(causticMap, worldPos, waterEyePos.xyz, worldNormal.xyz, lightDirectionWS0.xyz, waterLevel, waterTimer, windDir_windSpeed);
-    }
+    // NOTE: this calculation would be wrong for non-uniform scaling
+    float4 worldNormal = shMatrixMult(worldMatrix, float4(normal.xyz, 0));
+    waterEyePos = intercept(worldPos, cameraPos.xyz - worldPos, float3(0,1,0), waterLevel);
+    caustics = getCaustics(causticMap, worldPos, waterEyePos.xyz, worldNormal.xyz, lightDirectionWS0.xyz, waterLevel, waterTimer, windDir_windSpeed);
+    if (worldPos.y >= waterLevel || waterEnabled != 1)
+        caustics = float3(1,1,1);
 #endif
 
     
diff --git a/files/materials/shadows.h b/files/materials/shadows.h
index 769a4fea7..b1dc92d21 100644
--- a/files/materials/shadows.h
+++ b/files/materials/shadows.h
@@ -36,12 +36,16 @@ float pssmDepthShadow (
 {
     float shadow;
     
+    float pcf1 = depthShadowPCF(shadowMap0, lightSpacePos0, invShadowmapSize0);
+    float pcf2 = depthShadowPCF(shadowMap1, lightSpacePos1, invShadowmapSize1);
+    float pcf3 = depthShadowPCF(shadowMap2, lightSpacePos2, invShadowmapSize2);
+    
     if (depth < pssmSplitPoints.x)
-        shadow = depthShadowPCF(shadowMap0, lightSpacePos0, invShadowmapSize0);
+        shadow = pcf1;
     else if (depth < pssmSplitPoints.y)
-        shadow = depthShadowPCF(shadowMap1, lightSpacePos1, invShadowmapSize1);
+        shadow = pcf2;
     else
-        shadow = depthShadowPCF(shadowMap2, lightSpacePos2, invShadowmapSize2);
+        shadow = pcf3;
 
     return shadow;
 }
diff --git a/files/materials/terrain.shader b/files/materials/terrain.shader
index 0458c4db9..7ef26d035 100644
--- a/files/materials/terrain.shader
+++ b/files/materials/terrain.shader
@@ -224,13 +224,14 @@
 
         float3 worldPos = shMatrixMult(worldMatrix, float4(objSpacePosition,1)).xyz;
         float3 waterEyePos = float3(1,1,1);
-        if (worldPos.y < waterLevel)
-        {
-            // NOTE: this calculation would be wrong for non-uniform scaling
-            float4 worldNormal = shMatrixMult(worldMatrix, float4(normal.xyz, 0));
-            waterEyePos = intercept(worldPos, cameraPos.xyz - worldPos, float3(0,1,0), waterLevel);
-            caustics = getCaustics(causticMap, worldPos, waterEyePos.xyz, worldNormal.xyz, lightDirectionWS0.xyz, waterLevel, waterTimer, windDir_windSpeed);
-        }
+        // NOTE: this calculation would be wrong for non-uniform scaling
+        float4 worldNormal = shMatrixMult(worldMatrix, float4(normal.xyz, 0));
+        waterEyePos = intercept(worldPos, cameraPos.xyz - worldPos, float3(0,1,0), waterLevel);
+        caustics = getCaustics(causticMap, worldPos, waterEyePos.xyz, worldNormal.xyz, lightDirectionWS0.xyz, waterLevel, waterTimer, windDir_windSpeed);
+        if (worldPos.y >= waterLevel)
+            caustics = float3(1,1,1);
+        
+
 
 #endif
         
@@ -285,7 +286,7 @@
 #if SHADOWS || SHADOWS_PSSM
             float fadeRange = shadowFar_fadeStart.x - shadowFar_fadeStart.y;
             float fade = 1-((depth - shadowFar_fadeStart.y) / fadeRange);
-            shadow = (depth > shadowFar_fadeStart.x) ? 1 : ((depth > shadowFar_fadeStart.y) ? 1-((1-shadow)*fade) : shadow);
+            shadow = (depth > shadowFar_fadeStart.x) ? 1.0 : ((depth > shadowFar_fadeStart.y) ? 1.0-((1.0-shadow)*fade) : shadow);
 #endif
 
 #if !SHADOWS && !SHADOWS_PSSM