#762 - First in another round of fixes for localization