More Texture fixes