Resolved Localization issues