- WIP on locale_fixes patch