Added LETARTARE's additional fixes for localization