Few more localization changes