Small fixes to handle EN-GB properly.