Minor fix with non-list uniforms