L10n related fixes