Small improvements on Previous locale Fix