Various fixes to association data saving