Country/State issues

Hi, I have come across 2 (maybe related?) issues with the Country/State options with additional addresses.
Issue 1) When the country its set to Denmark the state field is hidden but on ‘save’ shows a ‘State required’ error. Denmark does not use a state field. Works on primary address, just any additional addresses shows the error. Only difference I can see in the code is the field name changes from ‘shipping_state’ to ‘shipping(x)_state’.
Issue 2) In testing issue 1, I have noticed that the type of state field (box/autofill etc.) in additional addresses is set by the primary address country when you try to edit the additional address. When adding the first time if you change the country the state field changes but on edit it reverts to the primary country type. i.e Primary is USA, additional set to UK shows county on add but reverts to state (with autofill list) on edit. This means that an additional addresses have to be in the same country as the primary.
Hope that makes sense and let me know if you need any further details or would like me to test anything.