Improve l10n aspects