locale fixes (readded some stuff after phase2 update)