Numerous updates for localization support