more fixes for locale