Fixed more localization issues