Improve locale messages