fixup uniforms behavior