Minor translate and template changes