[misc] Improved localization