Fix for the extension parsing bug, as well as some extra checks for unsetting US country codes from other forks.