Tweaks to TE overridding