More work on Settings and Locale