Bug fix: Country code constants