more TE compat fixes