Fix new automatic uniforms after merge