Changes following "Make TextureSet a non property owner"