Fix TE integration