Add locale overrides, better sniffing