+ Fix the "Country" attribute of the "State" defined type to use the correct defined type (Fixes #528).
+ Fix issue with address country not defaulting to the organization's country (Fixes #529)