Various fixes to new options in Add State dialog.