Improve locale guessing