Rework locale setup