TE item support fixes