fixes for self-associated models, re #6830