Fixing localization issues