Removing invalid type
Enhance l10n