Bunch of hotfix changes for counties change.