More tweaks for TES2 track