More track overlay optimizations