Language and template fixes