Minor texture handling improvements