Fixing the locale interface