Final batch of l10n changes