Creedence ln - localization issue fixes