Shader rigging fixes