Fixes to localization part