Trying to fix the missing locale messages...