Small template changes.