Fix bug and add more locales.