More localization and fixes