More tweaks so non-English locale can pass