Fixes for TE