Localization and other fixes