Fixed shadow map problems post-merge