Make some localization improvements