Bug fixes to handle multiple spouses