A few more optimizations
Fix shaders for updated driver