More fixes to shader.