Rework locale handling