Some additional fixes to the shader