locale fixes after phase2 push