Some locale improvements