Second batch of l10n fixes