Fixes after testing TE support