More work on TE3 compatibility