Fixes to labels and locale file