Fixes and locale file