Field/RepeatingFieldSet: fixes