More texture fixes