fix locale and display issues