minor revisions to avoid adding l10n blocks