Fixed old references to country class