Fix localization bugs