Some locale fixes