Fixed localization issues