More template changes.