Fixing l10n problems and files