Improve l10n a bit