Fix some issues in the progress of the localization