Fix single run templates