Fix up handling of C locale