Shader improvements/fix