Some more template changes.