Locale attempt, some other minor changes.